Changeset 80938 in webkit for trunk/Source/JavaScriptCore/runtime/JSValue.h

Timestamp:

Mar 12, 2011, 7:54:17 AM (14 years ago)

Author:

[email protected]

Message:

2011-03-12 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r80919.
​http://trac.webkit.org/changeset/80919
​https://bugs.webkit.org/show_bug.cgi?id=56251

all windows bots failed to compile this change (Requested by
loislo on #webkit).

• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/StructureStubInfo.cpp:
• interpreter/Register.h: (JSC::Register::withInt): (JSC::Register::withCallee): (JSC::Register::operator=): (JSC::Register::i): (JSC::Register::activation): (JSC::Register::function): (JSC::Register::propertyNameIterator): (JSC::Register::scopeChain):
• jit/JIT.h:
• jit/JITCall.cpp: (JSC::JIT::compileOpCallInitializeCallFrame): (JSC::JIT::compileOpCallVarargs): (JSC::JIT::compileOpCall):
• jit/JITCall32_64.cpp: (JSC::JIT::compileOpCallInitializeCallFrame): (JSC::JIT::compileOpCallVarargs): (JSC::JIT::compileOpCall): (JSC::JIT::compileOpCallSlowCase):
• jit/JITInlineMethods.h: (JSC::JIT::emitPutToCallFrameHeader):
• jit/JITOpcodes.cpp: (JSC::JIT::privateCompileCTINativeCall): (JSC::JIT::emit_op_get_pnames): (JSC::JIT::emit_op_next_pname): (JSC::JIT::emit_op_load_varargs): (JSC::JIT::emitSlow_op_load_varargs):
• jit/JITOpcodes32_64.cpp: (JSC::JIT::privateCompileCTINativeCall): (JSC::JIT::emit_op_get_pnames): (JSC::JIT::emit_op_next_pname):
• jit/JSInterfaceJIT.h: (JSC::JSInterfaceJIT::payloadFor):
• jit/SpecializedThunkJIT.h: (JSC::SpecializedThunkJIT::returnJSValue): (JSC::SpecializedThunkJIT::returnDouble): (JSC::SpecializedThunkJIT::returnInt32): (JSC::SpecializedThunkJIT::returnJSCell):
• runtime/ArgList.cpp:
• runtime/DateConversion.cpp:
• runtime/GCActivityCallbackCF.cpp:
• runtime/Identifier.cpp:
• runtime/JSActivation.h: (JSC::asActivation):
• runtime/JSLock.cpp:
• runtime/JSNumberCell.cpp:
• runtime/JSObject.h:
• runtime/JSPropertyNameIterator.h:
• runtime/JSValue.h:
• runtime/JSZombie.cpp:
• runtime/MarkedBlock.cpp:
• runtime/MarkedSpace.cpp:
• runtime/PropertyNameArray.cpp:
• runtime/ScopeChain.h: (JSC::ExecState::globalThisValue):
• wtf/DateMath.cpp:

2011-03-12 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r80919.
​http://trac.webkit.org/changeset/80919
​https://bugs.webkit.org/show_bug.cgi?id=56251

all windows bots failed to compile this change (Requested by
loislo on #webkit).

• bridge/c/c_class.cpp:
• bridge/c/c_runtime.cpp:
• bridge/jni/JavaMethod.cpp:
• plugins/PluginViewNone.cpp:

File:

• trunk/Source/JavaScriptCore/runtime/JSValue.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/JSValue.h

@@ -53 +53 @@
     enum PreferredPrimitiveType { NoPreference, PreferNumber, PreferString };
 
-
 #if USE(JSVALUE32_64)
     typedef int64_t EncodedJSValue;
@@ -59 +58 @@
     typedef void* EncodedJSValue;
 #endif
-    
-    union EncodedValueDescriptor {
-        EncodedJSValue asEncodedJSValue;
-#if USE(JSVALUE32_64)
-        double asDouble;
-#elif USE(JSVALUE64)
-        JSCell* ptr;
-#endif
-        
-#if CPU(BIG_ENDIAN)
-        struct {
-            int32_t tag;
-            int32_t payload;
-        } asBits;
-#else
-        struct {
-            int32_t payload;
-            int32_t tag;
-        } asBits;
-#endif
-    };
 
     double nonInlineNaN();
@@ -262 +240 @@
         
         enum { LowestTag =  DeletedValueTag };
-
+        
         uint32_t tag() const;
         int32_t payload() const;
 
-        EncodedValueDescriptor u;
-#elif USE(JSVALUE64)
+        union {
+            EncodedJSValue asEncodedJSValue;
+            double asDouble;
+#if CPU(BIG_ENDIAN)
+            struct {
+                int32_t tag;
+                int32_t payload;
+            } asBits;
+#else
+            struct {
+                int32_t payload;
+                int32_t tag;
+            } asBits;
+#endif
+        } u;
+#else // USE(JSVALUE32_64)
         JSCell* m_ptr;
-#endif
+#endif // USE(JSVALUE32_64)
     };