Unreviewed, fix cloop.

* assembler/AbstractMacroAssembler.h:
* heap/SlotVisitor.cpp:

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 6131514e486df7e82c80ffdac7e558a3e88b3967..33b7d6cf03646f98aba0f6570e3df059d470e7b5 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -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
 2016-09-22  Filip Pizlo  <fpizlo@apple.com>
 
         Need a store-load fence between setting cell state and visiting the object in SlotVisitor

diff --git a/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h b/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
index d05c913319f91faa7d4c034fd8235af50c630185..31fc87e4000c58853c5f05235ab3b0e174d99d95 100644 (file)
--- a/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
+++ b/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
@@ -35,8 +35,6 @@
 #include <wtf/SharedTask.h>
 #include <wtf/WeakRandom.h>
 
 #include <wtf/SharedTask.h>
 #include <wtf/WeakRandom.h>
 

-#if ENABLE(ASSEMBLER)
-

 namespace JSC {
 
 inline bool isARMv7IDIVSupported()
 namespace JSC {
 
 inline bool isARMv7IDIVSupported()


@@ -95,6 +93,8 @@ inline bool optimizeForX86_64()
     return isX86_64() && Options::useArchitectureSpecificOptimizations();
 }
 
     return isX86_64() && Options::useArchitectureSpecificOptimizations();
 }
 

+#if ENABLE(ASSEMBLER)
+

 class AllowMacroScratchRegisterUsage;
 class DisallowMacroScratchRegisterUsage;
 class LinkBuffer;
 class AllowMacroScratchRegisterUsage;
 class DisallowMacroScratchRegisterUsage;
 class LinkBuffer;


@@ -1165,8 +1165,8 @@ AbstractMacroAssembler<AssemblerType, MacroAssemblerType>::Address::indexedBy(
     return BaseIndex(base, index, scale, offset);
 }
 
     return BaseIndex(base, index, scale, offset);
 }
 

-} // namespace JSC
-

 #endif // ENABLE(ASSEMBLER)
 
 #endif // ENABLE(ASSEMBLER)
 

+} // namespace JSC
+

 #endif // AbstractMacroAssembler_h
 #endif // AbstractMacroAssembler_h

diff --git a/Source/JavaScriptCore/heap/SlotVisitor.cpp b/Source/JavaScriptCore/heap/SlotVisitor.cpp
index 8d5eebaeaf407a82706d7b565f315743589c7c08..56301165dd4eeb1c64ab63a120d893a34359eb82 100644 (file)
--- a/Source/JavaScriptCore/heap/SlotVisitor.cpp
+++ b/Source/JavaScriptCore/heap/SlotVisitor.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "SlotVisitor.h"
 
 #include "config.h"
 #include "SlotVisitor.h"
 

+#include "AbstractMacroAssembler.h"

 #include "ConservativeRoots.h"
 #include "GCSegmentedArrayInlines.h"
 #include "HeapCellInlines.h"
 #include "ConservativeRoots.h"
 #include "GCSegmentedArrayInlines.h"
 #include "HeapCellInlines.h"