Changeset 227609 in webkit for trunk/Source/JavaScriptCore/bytecode/AccessCase.cpp

Timestamp:

Jan 25, 2018, 9:21:09 AM (8 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r227592.
​https://bugs.webkit.org/show_bug.cgi?id=182110

it made ARM64 (Linux and iOS) crash (Requested by pizlo-mbp on
#webkit).

Reverted changeset:

"JSC GC should support TLCs (thread local caches)"
​https://bugs.webkit.org/show_bug.cgi?id=181559
​https://trac.webkit.org/changeset/227592

File:

• trunk/Source/JavaScriptCore/bytecode/AccessCase.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/bytecode/AccessCase.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -956 +956 @@
 
             if (allocatingInline) {
-                Allocator allocator = vm.jsValueGigacageAuxiliarySpace.allocatorFor(newSize, AllocatorForMode::AllocatorIfExists);
-
-                jit.emitAllocate(scratchGPR, JITAllocator::constant(allocator), scratchGPR2, scratchGPR3, slowPath);
+                BlockDirectory* allocator = vm.jsValueGigacageAuxiliarySpace.allocatorFor(newSize, AllocatorForMode::AllocatorIfExists);
+
+                if (!allocator) {
+                    // Yuck, this case would suck!
+                    slowPath.append(jit.jump());
+                }
+
+                jit.move(CCallHelpers::TrustedImmPtr(allocator), scratchGPR2);
+                jit.emitAllocate(scratchGPR, allocator, scratchGPR2, scratchGPR3, slowPath);
                 jit.addPtr(CCallHelpers::TrustedImm32(newSize + sizeof(IndexingHeader)), scratchGPR);