Merged INLINE_OPTIMIZED intrinsic type into INLINE.

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 754 matching lines @@
 class JavaScriptFrameIterator;  // Forward declaration.
 
 
 class Runtime : public AllStatic {
  public:
   enum FunctionId {
 #define F(name, nargs, ressize) k##name,
     RUNTIME_FUNCTION_LIST(F) INLINE_OPTIMIZED_FUNCTION_LIST(F)
 #undef F
 #define F(name, nargs, ressize) kInline##name,
-    INLINE_FUNCTION_LIST(F)
+        INLINE_FUNCTION_LIST(F) INLINE_OPTIMIZED_FUNCTION_LIST(F)
 #undef F
-#define F(name, nargs, ressize) kInlineOptimized##name,
-    INLINE_OPTIMIZED_FUNCTION_LIST(F)
-#undef F
-    kNumFunctions,
-    kFirstInlineFunction = kInlineIsSmi
+            kNumFunctions,
+    // TODO(svenpanne) The values below are cruel hacks, remove them!
+    kFirstInlineFunction = kInlineIsSmi,
+    kLastInlineFunction = kInlineDebugIsActive
   };
 
-  enum IntrinsicType { RUNTIME, INLINE, INLINE_OPTIMIZED };
+  enum IntrinsicType { RUNTIME, INLINE };
 
   // Intrinsic function descriptor.
   struct Function {
     FunctionId function_id;
     IntrinsicType intrinsic_type;
     // The JS name of the function.
     const char* name;
 
     // The C++ (native) entry point.  NULL if the function is inlined.
     byte* entry;
@@ skipping 107 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_