Changeset 91482 in webkit for trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

Timestamp:

Jul 21, 2011, 11:57:57 AM (14 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=64964
DFG JIT - Enable support for eval code

Reviewed by Sam Weinig.

This is basically the same as program code, to the JIT!

• bytecode/Opcode.cpp:
• bytecode/Opcode.h:
  • Enable opcodeNames in !NDEBUG builds.
• dfg/DFGOperations.cpp:
  • Fix a bug exposed by eval support, throw correct type error for new.
• runtime/Executable.cpp:

(JSC::EvalExecutable::compileInternal):

• Enable DFG JIT for eval code.

File:

• trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -483 +483 @@
     
         ASSERT(callType == CallTypeNone);
-    } else {
-        ASSERT(kind == CodeForConstruct);
+        exec->globalData().exception = createNotAFunctionError(exec, callee);
+        return 0;
+    }
+
+    ASSERT(kind == CodeForConstruct);
+    
+    ConstructData constructData;
+    ConstructType constructType = getConstructData(callee, constructData);
+    
+    ASSERT(constructType != ConstructTypeJS);
+    
+    if (constructType == ConstructTypeHost) {
+        if (!globalData->interpreter->registerFile().grow(execCallee->registers())) {
+            globalData->exception = createStackOverflowError(exec);
+            return 0;
+        }
         
-        ConstructData constructData;
-        ConstructType constructType = getConstructData(callee, constructData);
+        execCallee->setScopeChain(exec->scopeChain());
         
-        ASSERT(constructType != ConstructTypeJS);
+        globalData->hostCallReturnValue = JSValue::decode(constructData.native.function(execCallee));
         
-        if (constructType == ConstructTypeHost) {
-            if (!globalData->interpreter->registerFile().grow(execCallee->registers())) {
-                globalData->exception = createStackOverflowError(exec);
-                return 0;
-            }
-            
-            execCallee->setScopeChain(exec->scopeChain());
-            
-            globalData->hostCallReturnValue = JSValue::decode(constructData.native.function(execCallee));
-            
-            if (globalData->exception)
-                return 0;
-            return reinterpret_cast<void*>(getHostCallReturnValue);
-        }
-        
-        ASSERT(constructType == ConstructTypeNone);
-    }
-    exec->globalData().exception = createNotAFunctionError(exec, callee);
+        if (globalData->exception)
+            return 0;
+        return reinterpret_cast<void*>(getHostCallReturnValue);
+    }
+    
+    ASSERT(constructType == ConstructTypeNone);
+    exec->globalData().exception = createNotAConstructorError(exec, callee);
     return 0;
 }