From: fpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 23 Sep 2016 18:47:41 +0000 (+0000)
Subject: Unreviewed, fix cloop.
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=74a353fff8bfa71e03c2bc35e291dd08acc8041d;ds=sidebyside

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 6131514e486d..33b7d6cf0364 100644
--- 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
diff --git a/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h b/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
index d05c913319f9..31fc87e4000c 100644
--- a/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
+++ b/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
@@ -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
diff --git a/Source/JavaScriptCore/heap/SlotVisitor.cpp b/Source/JavaScriptCore/heap/SlotVisitor.cpp
index 8d5eebaeaf40..56301165dd4e 100644
--- a/Source/JavaScriptCore/heap/SlotVisitor.cpp
+++ b/Source/JavaScriptCore/heap/SlotVisitor.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "SlotVisitor.h"
 
+#include "AbstractMacroAssembler.h"
 #include "ConservativeRoots.h"
 #include "GCSegmentedArrayInlines.h"
 #include "HeapCellInlines.h"