Re-arranged intrinsic macros a bit.

src/runtime/runtime.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_RUNTIME_RUNTIME_H_
 #define V8_RUNTIME_RUNTIME_H_
 
 #include "src/allocation.h"
 #include "src/objects.h"
 #include "src/zone.h"
@@ skipping 492 matching lines @@
   F(DeclareModules, 1, 1)                                    \
   F(DeclareLookupSlot, 4, 1)                                 \
   F(InitializeConstGlobal, 2, 1)                             \
   F(InitializeLegacyConstLookupSlot, 3, 1)                   \
                                                              \
   /* Maths */                                                \
   F(MathPowSlow, 2, 1)                                       \
   F(MathPowRT, 2, 1)
 
 
-#define RUNTIME_FUNCTION_LIST_RETURN_PAIR(F)              \
+#define FOR_EACH_INTRINSIC_RETURN_PAIR(F)                 \
   F(LoadLookupSlot, 2, 2)                                 \
   F(LoadLookupSlotNoReferenceError, 2, 2)                 \
   F(ResolvePossiblyDirectEval, 6, 2)                      \
   F(ForInInit, 2, 2) /* TODO(turbofan): Only temporary */ \
   F(ForInNext, 4, 2) /* TODO(turbofan): Only temporary */
 
 
 #define RUNTIME_FUNCTION_LIST_DEBUGGER(F)           \
   /* Debugger support*/                             \
   F(DebugBreak, 0, 1)                               \
@@ skipping 95 matching lines @@
   F(BreakIteratorFirst, 1, 1)                 \
   F(BreakIteratorNext, 1, 1)                  \
   F(BreakIteratorCurrent, 1, 1)               \
   F(BreakIteratorBreakType, 1, 1)
 
 #else
 #define RUNTIME_FUNCTION_LIST_I18N_SUPPORT(F)
 #endif
 
 
-#define RUNTIME_FUNCTION_LIST_RETURN_OBJECT(F) \
-  RUNTIME_FUNCTION_LIST_ALWAYS_1(F)            \
-  RUNTIME_FUNCTION_LIST_ALWAYS_2(F)            \
-  RUNTIME_FUNCTION_LIST_ALWAYS_3(F)            \
-  RUNTIME_FUNCTION_LIST_DEBUGGER(F)            \
-  RUNTIME_FUNCTION_LIST_I18N_SUPPORT(F)
-
-
-// RUNTIME_FUNCTION_LIST_ defines the intrinsics typically implemented only
-// as runtime functions. These come in 2 flavors, either returning an object or
-// returning a pair.
-// Entries have the form F(name, number of arguments, number of return values).
-#define RUNTIME_FUNCTION_LIST(F)         \
-  RUNTIME_FUNCTION_LIST_RETURN_OBJECT(F) \
-  RUNTIME_FUNCTION_LIST_RETURN_PAIR(F)
-
-
 // ----------------------------------------------------------------------------
 // INLINE_FUNCTION_LIST defines the intrinsics typically handled specially by
 // the various compilers.
 // Entries have the form F(name, number of arguments, number of return values).
 #define INLINE_FUNCTION_LIST(F)                             \
   F(IsSmi, 1, 1)                                            \
   F(IsNonNegativeSmi, 1, 1)                                 \
   F(IsArray, 1, 1)                                          \
   F(IsRegExp, 1, 1)                                         \
   F(IsJSProxy, 1, 1)                                        \
@@ skipping 69 matching lines @@
   F(SetClear, 1, 1)                       \
   F(SetDelete, 2, 1)                      \
   F(SetGetSize, 1, 1)                     \
   F(SetHas, 2, 1)                         \
   F(SetInitialize, 1, 1)                  \
   /* Arrays */                            \
   F(HasFastPackedElements, 1, 1)          \
   F(GetPrototype, 1, 1)
 
 
-#define FOR_EACH_INTRINSIC(F) \
-  RUNTIME_FUNCTION_LIST(F)    \
-  INLINE_FUNCTION_LIST(F)     \
+#define FOR_EACH_INTRINSIC_RETURN_OBJECT(F) \
+  RUNTIME_FUNCTION_LIST_ALWAYS_1(F)         \
+  RUNTIME_FUNCTION_LIST_ALWAYS_2(F)         \
+  RUNTIME_FUNCTION_LIST_ALWAYS_3(F)         \
+  RUNTIME_FUNCTION_LIST_DEBUGGER(F)         \
+  RUNTIME_FUNCTION_LIST_I18N_SUPPORT(F)     \
+  INLINE_FUNCTION_LIST(F)                   \
   INLINE_OPTIMIZED_FUNCTION_LIST(F)
 
+
+// FOR_EACH_INTRINSIC defines the list of all intrinsics, coming in 2 flavors,
+// either returning an object or a pair.
+// Entries have the form F(name, number of arguments, number of values).
+#define FOR_EACH_INTRINSIC(F)       \
+  FOR_EACH_INTRINSIC_RETURN_PAIR(F) \
+  FOR_EACH_INTRINSIC_RETURN_OBJECT(F)
+
+
 //---------------------------------------------------------------------------
 // Runtime provides access to all C++ runtime functions.
 
 class RuntimeState {
  public:
   unibrow::Mapping<unibrow::ToUppercase, 128>* to_upper_mapping() {
     return &to_upper_mapping_;
   }
   unibrow::Mapping<unibrow::ToLowercase, 128>* to_lower_mapping() {
     return &to_lower_mapping_;
@@ skipping 146 matching lines @@
 
 class DeclareGlobalsEvalFlag : public BitField<bool, 0, 1> {};
 class DeclareGlobalsNativeFlag : public BitField<bool, 1, 1> {};
 STATIC_ASSERT(LANGUAGE_END == 3);
 class DeclareGlobalsLanguageMode : public BitField<LanguageMode, 2, 2> {};
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_RUNTIME_RUNTIME_H_