Unreviewed, fix cloop.
authorfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Sep 2016 18:47:41 +0000 (18:47 +0000)
committerfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Sep 2016 18:47:41 +0000 (18:47 +0000)
* assembler/AbstractMacroAssembler.h:
* heap/SlotVisitor.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@206316 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
Source/JavaScriptCore/heap/SlotVisitor.cpp

index 6131514..33b7d6c 100644 (file)
@@ -1,3 +1,10 @@
+2016-09-23  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, fix cloop.
+
+        * assembler/AbstractMacroAssembler.h:
+        * heap/SlotVisitor.cpp:
+
 2016-09-22  Filip Pizlo  <fpizlo@apple.com>
 
         Need a store-load fence between setting cell state and visiting the object in SlotVisitor
index d05c913..31fc87e 100644 (file)
@@ -35,8 +35,6 @@
 #include <wtf/SharedTask.h>
 #include <wtf/WeakRandom.h>
 
-#if ENABLE(ASSEMBLER)
-
 namespace JSC {
 
 inline bool isARMv7IDIVSupported()
@@ -95,6 +93,8 @@ inline bool optimizeForX86_64()
     return isX86_64() && Options::useArchitectureSpecificOptimizations();
 }
 
+#if ENABLE(ASSEMBLER)
+
 class AllowMacroScratchRegisterUsage;
 class DisallowMacroScratchRegisterUsage;
 class LinkBuffer;
@@ -1165,8 +1165,8 @@ AbstractMacroAssembler<AssemblerType, MacroAssemblerType>::Address::indexedBy(
     return BaseIndex(base, index, scale, offset);
 }
 
-} // namespace JSC
-
 #endif // ENABLE(ASSEMBLER)
 
+} // namespace JSC
+
 #endif // AbstractMacroAssembler_h
index 8d5eeba..5630116 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "SlotVisitor.h"
 
+#include "AbstractMacroAssembler.h"
 #include "ConservativeRoots.h"
 #include "GCSegmentedArrayInlines.h"
 #include "HeapCellInlines.h"