Changeset 228193 in webkit for trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp

Timestamp:

Feb 6, 2018, 2:42:26 PM (7 years ago)

Author:

[email protected]

Message:

put_to_scope/get_from_scope should not cache lexical scopes when expecting a global object
​https://bugs.webkit.org/show_bug.cgi?id=182549
<rdar://problem/36189995>

Reviewed by Saam Barati.

JSTests:

• stress/var-injection-cache-invalidation.js: Added.

(allocateLotsOfThings):
(test):

Source/JavaScriptCore:

Previously, the llint/baseline caching for put_to_scope and
get_from_scope would cache lexical environments when the
varInjectionWatchpoint had been fired for global properties. Code
in the DFG does not follow this same assumption so we could
potentially return the wrong result. Additionally, the baseline
would write barrier the global object rather than the lexical
enviroment object. This patch makes it so that we do not cache
anything other than the global object for when the resolve type is
GlobalPropertyWithVarInjectionChecks or GlobalProperty.

• assembler/MacroAssembler.cpp:

(JSC::MacroAssembler::jitAssert):

• assembler/MacroAssembler.h:
• jit/JITPropertyAccess.cpp:

(JSC::JIT::emit_op_get_from_scope):
(JSC::JIT::emit_op_put_to_scope):

• runtime/CommonSlowPaths.h:

(JSC::CommonSlowPaths::tryCachePutToScopeGlobal):
(JSC::CommonSlowPaths::tryCacheGetFromScopeGlobal):

• runtime/Options.h:

File:

• trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp

@@ -29 +29 @@
 #if ENABLE(ASSEMBLER)
 
+#include "Options.h"
 #include "ProbeContext.h"
 #include <wtf/PrintStream.h>
+#include <wtf/ScopedLambda.h>
 
 namespace JSC {
 
 const double MacroAssembler::twoToThe32 = (double)0x100000000ull;
+
+void MacroAssembler::jitAssert(const ScopedLambda<Jump(void)>& functor)
+{
+    if (Options::enableJITDebugAssetions()) {
+        Jump passed = functor();
+        breakpoint();
+        passed.link(this);
+    }
+}
 
 #if ENABLE(MASM_PROBE)