Changeset 36244 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.cpp

Timestamp:

Sep 6, 2008, 10:44:58 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish-extreme to trunk.

File:

• trunk/JavaScriptCore/VM/CodeGenerator.cpp (modified) (2 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -1193 +1193 @@
 RegisterID* CodeGenerator::emitCatch(RegisterID* targetRegister, LabelID* start, LabelID* end)
 {
-    HandlerInfo info = { start->offsetFrom(0), end->offsetFrom(0), instructions().size(), m_dynamicScopeDepth };
+    HandlerInfo info = { start->offsetFrom(0), end->offsetFrom(0), instructions().size(), m_dynamicScopeDepth, 0 };
     exceptionHandlers().append(info);
     emitOpcode(op_catch);
@@ -1321 +1321 @@
         ASSERT(nodes[i]->isString());
         UString::Rep* clause = static_cast<StringNode*>(nodes[i])->value().rep();
-        jumpTable.add(clause, labels[i]->offsetFrom(switchAddress)); 
+        OffsetLocation location;
+        location.branchOffset = labels[i]->offsetFrom(switchAddress);
+#if ENABLE(CTI)
+        location.ctiOffset = 0;
+#endif
+        jumpTable.offsetTable.add(clause, location);
     }
 }