Changeset 37422 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 8, 2008, 5:20:41 AM (17 years ago)

Author:

Simon Hausmann

Message:

2008-10-08 Prasanth Ullattil <​[email protected]>

Reviewed by Oliver Hunt.

Avoid endless loops when compiling without the computed goto
optimization.

NEXT_OPCODE expands to "continue", which will not work inside
loops.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/Machine.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-08  Prasanth Ullattil  <[email protected]>
+
+        Reviewed by Oliver Hunt.
+
+        Avoid endless loops when compiling without the computed goto
+        optimization.
+
+        NEXT_OPCODE expands to "continue", which will not work inside
+        loops.
+
+        * VM/Machine.cpp:
+        (JSC::Machine::privateExecute):
+
 2008-10-08  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/VM/Machine.cpp

@@ -1504 +1504 @@
     NEXT_OPCODE;
 #else
-    #define NEXT_OPCODE MACHINE_SAMPLING_sample(this->codeBlock(r), vPC); continue
+    #define NEXT_OPCODE MACHINE_SAMPLING_sample(this->codeBlock(r), vPC); goto interpreterLoopStart
 #if DUMP_OPCODE_STATS
     #define BEGIN_OPCODE(opcode) case opcode: OpcodeStats::recordInstruction(opcode);
@@ -1510 +1510 @@
     #define BEGIN_OPCODE(opcode) case opcode:
 #endif
-    while (1) // iterator loop begins
+    while (1) { // iterator loop begins
+    interpreterLoopStart:;
     switch (vPC->u.opcode)
 #endif
@@ -3914 +3915 @@
     }
     }
+#if !HAVE(COMPUTED_GOTO)
+    } // iterator loop ends
+#endif
     #undef NEXT_OPCODE
     #undef BEGIN_OPCODE