Merge branch 'master' into v2.1

2014-03-27 23:32:45 +01:00
parent 3500c35e23 095344ce7c
commit 4401af88dc
2 changed files with 4 additions and 1 deletions
--- a/src/lj_jit.h
+++ b/src/lj_jit.h
@@ -278,6 +278,7 @@ typedef struct BPropEntry {

 /* Scalar evolution analysis cache. */
 typedef struct ScEvEntry {
+  MRef pc;		/* Bytecode PC of FORI. */
  IRRef1 idx;		/* Index reference. */
  IRRef1 start;		/* Constant start reference. */
  IRRef1 stop;		/* Constant stop reference. */