Changeset 225629 in webkit for trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

Timestamp:

Dec 7, 2017, 8:32:42 AM (8 years ago)

Author:

Michael Catanzaro

Message:

Unreviewed, rolling out r225620
​https://bugs.webkit.org/show_bug.cgi?id=180514
<rdar://problem/35901694>

It broke the build with GCC 7, and I don't know how to fix it.

Source/JavaScriptCore:

• API/JSCallbackObject.h:
• API/JSObjectRef.cpp:

(classInfoPrivate):

• JavaScriptCore.xcodeproj/project.pbxproj:
• Sources.txt:
• assembler/MacroAssemblerCodeRef.h:

(JSC::FunctionPtr::FunctionPtr):
(JSC::FunctionPtr::value const):
(JSC::FunctionPtr::executableAddress const):
(JSC::ReturnAddressPtr::ReturnAddressPtr):
(JSC::ReturnAddressPtr::value const):
(JSC::MacroAssemblerCodePtr::MacroAssemblerCodePtr):
(JSC::MacroAssemblerCodePtr::createFromExecutableAddress):
(JSC::MacroAssemblerCodePtr::scrambledPtr const):
(JSC::MacroAssemblerCodePtr:: const):
(JSC::MacroAssemblerCodePtr::operator! const):
(JSC::MacroAssemblerCodePtr::operator== const):
(JSC::MacroAssemblerCodePtr::emptyValue):
(JSC::MacroAssemblerCodePtr::deletedValue):
(JSC::MacroAssemblerCodePtr::poisonedPtr const): Deleted.

• b3/B3LowerMacros.cpp:
• b3/testb3.cpp:

(JSC::B3::testInterpreter):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::checkArray):
(JSC::DFG::SpeculativeJIT::compileCheckSubClass):
(JSC::DFG::SpeculativeJIT::compileNewStringObject):
(JSC::DFG::SpeculativeJIT::emitSwitchIntJump):

• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::compileNewStringObject):
(JSC::FTL::DFG::LowerDFGToB3::compileCheckSubClass):

• jit/AssemblyHelpers.h:

(JSC::AssemblyHelpers::emitAllocateDestructibleObject):

• jit/SpecializedThunkJIT.h:

(JSC::SpecializedThunkJIT::loadArgumentWithSpecificClass):

• jit/ThunkGenerators.cpp:

(JSC::virtualThunkFor):
(JSC::boundThisNoArgsFunctionCallGenerator):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::handleHostCall):
(JSC::LLInt::setUpCall):

• llint/LowLevelInterpreter64.asm:
• runtime/InitializeThreading.cpp:

(JSC::initializeThreading):

• runtime/JSCScrambledPtr.cpp: Renamed from Source/JavaScriptCore/runtime/JSCPoisonedPtr.cpp.

(JSC::initializeScrambledPtrKeys):

• runtime/JSCScrambledPtr.h: Renamed from Source/JavaScriptCore/runtime/JSCPoisonedPtr.h.
• runtime/JSDestructibleObject.h:

(JSC::JSDestructibleObject::classInfo const):

• runtime/JSSegmentedVariableObject.h:

(JSC::JSSegmentedVariableObject::classInfo const):

• runtime/Structure.h:
• runtime/VM.h:

Source/WTF:

• WTF.xcodeproj/project.pbxproj:
• wtf/CMakeLists.txt:
• wtf/Poisoned.h: Removed.
• wtf/ScrambledPtr.cpp: Renamed from Source/WTF/wtf/Poisoned.cpp.

(WTF::makeScrambledPtrKey):

• wtf/ScrambledPtr.h: Added.

(WTF::ScrambledPtr::ScrambledPtr):
(WTF::ScrambledPtr::assertIsScrambled const):
(WTF::ScrambledPtr::assertIsNotScrambled const):
(WTF::ScrambledPtr::descrambled const):
(WTF::ScrambledPtr::operator-> const):
(WTF::ScrambledPtr::bits const):
(WTF::ScrambledPtr::operator! const):
(WTF::ScrambledPtr::operator bool const):
(WTF::ScrambledPtr::operator== const):
(WTF::ScrambledPtr::operator==):
(WTF::ScrambledPtr::operator=):
(WTF::ScrambledPtr::scramble):
(WTF::ScrambledPtr::descramble):

File:

• trunk/Source/JavaScriptCore/API/JSObjectRef.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

@@ -432 +432 @@
         return jsObject->classInfo(vm);
 
-    return vm.currentlyDestructingCallbackObjectClassInfo.unpoisoned();
+    return vm.currentlyDestructingCallbackObjectClassInfo.descrambled();
 }