Reviewers: Sven Panne,
Description:
Remove duplicates in runtime macros.
Each item in INLINE_RUNTIME_FUNCTION_LIST had to have a duplicate
entry in RUNTIME_FUNCTION_LIST in order to match the comment.
[email protected]
Please review this at https://codereview.chromium.org/177313005/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+8, -23 lines):
M src/full-codegen.h
M src/full-codegen.cc
M src/hydrogen.h
M src/hydrogen.cc
M src/runtime.h
M src/runtime.cc
Index: src/full-codegen.cc
diff --git a/src/full-codegen.cc b/src/full-codegen.cc
index
16bb6c0d01330e73bacb096ed5d70619ed615078..0542f8f7e09581acfa3cb6e813c28baebe61a630
100644
--- a/src/full-codegen.cc
+++ b/src/full-codegen.cc
@@ -905,7 +905,6 @@ void FullCodeGenerator::SetSourcePosition(int pos) {
const FullCodeGenerator::InlineFunctionGenerator
FullCodeGenerator::kInlineFunctionGenerators[] = {
INLINE_FUNCTION_LIST(INLINE_FUNCTION_GENERATOR_ADDRESS)
- INLINE_RUNTIME_FUNCTION_LIST(INLINE_FUNCTION_GENERATOR_ADDRESS)
};
#undef INLINE_FUNCTION_GENERATOR_ADDRESS
Index: src/full-codegen.h
diff --git a/src/full-codegen.h b/src/full-codegen.h
index
d9090a8dc830137448b9bb4e6ac38f1240316909..4adc1bd9b7583d4a0009f0e448cf054d0292ce1c
100644
--- a/src/full-codegen.h
+++ b/src/full-codegen.h
@@ -497,7 +497,6 @@ class FullCodeGenerator: public AstVisitor {
#define EMIT_INLINE_RUNTIME_CALL(name, x, y) \
void Emit##name(CallRuntime* expr);
INLINE_FUNCTION_LIST(EMIT_INLINE_RUNTIME_CALL)
- INLINE_RUNTIME_FUNCTION_LIST(EMIT_INLINE_RUNTIME_CALL)
#undef EMIT_INLINE_RUNTIME_CALL
// Platform-specific code for resuming generators.
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index
6bc7f6982fb798f442eb5a55da8b380ac7868d0c..011ea071ae05fb04697f5c7eec4ea39588bdc4ce
100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -8399,7 +8399,6 @@ void HOptimizedGraphBuilder::VisitCallNew(CallNew*
expr) {
const HOptimizedGraphBuilder::InlineFunctionGenerator
HOptimizedGraphBuilder::kInlineFunctionGenerators[] = {
INLINE_FUNCTION_LIST(INLINE_FUNCTION_GENERATOR_ADDRESS)
- INLINE_RUNTIME_FUNCTION_LIST(INLINE_FUNCTION_GENERATOR_ADDRESS)
};
#undef INLINE_FUNCTION_GENERATOR_ADDRESS
Index: src/hydrogen.h
diff --git a/src/hydrogen.h b/src/hydrogen.h
index
b9d53be94e210e6b5faabf1d2918d8324ef67cc2..cb2f326a7eb4579e3db48ddabc0b8d53dce9ba72
100644
--- a/src/hydrogen.h
+++ b/src/hydrogen.h
@@ -2119,7 +2119,6 @@ class HOptimizedGraphBuilder : public HGraphBuilder,
public AstVisitor {
void Generate##Name(CallRuntime* call);
INLINE_FUNCTION_LIST(INLINE_FUNCTION_GENERATOR_DECLARATION)
- INLINE_RUNTIME_FUNCTION_LIST(INLINE_FUNCTION_GENERATOR_DECLARATION)
#undef INLINE_FUNCTION_GENERATOR_DECLARATION
void VisitDelete(UnaryOperation* expr);
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
306042f4ea65601e0e4ed3c5fe57ee08937be87c..71e64404084b6599d23f42d59dc1857b4ac24adc
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -14529,8 +14529,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_ListNatives)
{
#define COUNT_ENTRY(Name, argc, ressize) + 1
int entry_count = 0
RUNTIME_FUNCTION_LIST(COUNT_ENTRY)
- INLINE_FUNCTION_LIST(COUNT_ENTRY)
- INLINE_RUNTIME_FUNCTION_LIST(COUNT_ENTRY);
+ INLINE_FUNCTION_LIST(COUNT_ENTRY);
#undef COUNT_ENTRY
Factory* factory = isolate->factory();
Handle<FixedArray> elements = factory->NewFixedArray(entry_count);
@@ -14558,7 +14557,6 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_ListNatives)
{
RUNTIME_FUNCTION_LIST(ADD_ENTRY)
inline_runtime_functions = true;
INLINE_FUNCTION_LIST(ADD_ENTRY)
- INLINE_RUNTIME_FUNCTION_LIST(ADD_ENTRY)
#undef ADD_ENTRY
ASSERT_EQ(index, entry_count);
Handle<JSArray> result = factory->NewJSArrayWithElements(elements);
@@ -14903,9 +14901,11 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_MaxSmi) {
static const Runtime::Function kIntrinsicFunctions[] = {
RUNTIME_FUNCTION_LIST(F)
INLINE_FUNCTION_LIST(I)
- INLINE_RUNTIME_FUNCTION_LIST(I)
};
+#undef I
+#undef F
+
MaybeObject* Runtime::InitializeIntrinsicFunctionNames(Heap* heap,
Object* dictionary)
{
Index: src/runtime.h
diff --git a/src/runtime.h b/src/runtime.h
index
823285fd37661bad76a15483a06cc104b680512b..3722450a74a79bb71aa8f222cc21f1aed306355d
100644
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -131,7 +131,6 @@ namespace internal {
F(URIEscape, 1, 1) \
F(URIUnescape, 1, 1) \
\
- F(NumberToString, 1, 1) \
F(NumberToStringSkipCache, 1, 1) \
F(NumberToInteger, 1, 1) \
F(NumberToPositiveInteger, 1, 1) \
@@ -151,7 +150,6 @@ namespace internal {
F(NumberAlloc, 0, 1) \
F(NumberImul, 2, 1) \
\
- F(StringAdd, 2, 1) \
F(StringBuilderConcat, 3, 1) \
F(StringBuilderJoin, 3, 1) \
F(SparseJoinWithSeparator, 3, 1) \
@@ -171,7 +169,6 @@ namespace internal {
\
F(NumberCompare, 3, 1) \
F(SmiLexicographicCompare, 2, 1) \
- F(StringCompare, 2, 1) \
\
/* Math */ \
F(Math_acos, 1, 1) \
@@ -192,10 +189,8 @@ namespace internal {
\
/* Regular expressions */ \
F(RegExpCompile, 3, 1) \
- F(RegExpExec, 4, 1) \
F(RegExpExecMultiple, 4, 1) \
F(RegExpInitializeObject, 5, 1) \
- F(RegExpConstructResult, 3, 1) \
\
/* JSON */ \
F(ParseJson, 1, 1) \
@@ -203,11 +198,9 @@ namespace internal {
F(QuoteJSONString, 1, 1) \
\
/* Strings */ \
- F(StringCharCodeAt, 2, 1) \
F(StringIndexOf, 3, 1) \
F(StringLastIndexOf, 3, 1) \
F(StringLocaleCompare, 2, 1) \
- F(SubString, 3, 1) \
F(StringReplaceGlobalRegExpWithString, 4, 1) \
F(StringReplaceOneCharWithString, 3, 1) \
F(StringMatch, 3, 1) \
@@ -250,7 +243,6 @@ namespace internal {
F(GetAndClearOverflowedStackTrace, 1, 1) \
F(GetV8Version, 0, 1) \
\
- F(ClassOf, 1, 1) \
F(SetCode, 2, 1) \
F(SetExpectedNumberOfProperties, 2, 1) \
\
@@ -448,12 +440,8 @@ namespace internal {
F(TraceExit, 1, 1) \
F(Abort, 1, 1) \
F(AbortJS, 1, 1) \
- /* Logging */ \
- F(Log, 2, 1) \
/* ES5 */ \
F(LocalKeys, 1, 1) \
- /* Cache suport */ \
- F(GetFromCache, 2, 1) \
\
/* Message objects */ \
F(MessageGetStartPosition, 1, 1) \
@@ -611,7 +599,8 @@ namespace internal {
RUNTIME_FUNCTION_LIST_ALWAYS_2(F) \
RUNTIME_FUNCTION_LIST_DEBUG(F) \
RUNTIME_FUNCTION_LIST_DEBUGGER_SUPPORT(F) \
- RUNTIME_FUNCTION_LIST_I18N_SUPPORT(F)
+ RUNTIME_FUNCTION_LIST_I18N_SUPPORT(F) \
+ INLINE_RUNTIME_FUNCTION_LIST(F)
//
----------------------------------------------------------------------------
// INLINE_FUNCTION_LIST defines all inlined functions accessed
@@ -648,7 +637,8 @@ namespace internal {
F(FastAsciiArrayJoin, 2,
1) \
F(GeneratorNext, 2,
1) \
F(GeneratorThrow, 2,
1) \
- F(DebugBreakInOptimizedCode, 0, 1)
+ F(DebugBreakInOptimizedCode, 0,
1) \
+ INLINE_RUNTIME_FUNCTION_LIST(F)
//
----------------------------------------------------------------------------
@@ -722,7 +712,6 @@ class Runtime : public AllStatic {
#undef F
#define F(name, nargs, ressize) kInline##name,
INLINE_FUNCTION_LIST(F)
- INLINE_RUNTIME_FUNCTION_LIST(F)
#undef F
kNumFunctions,
kFirstInlineFunction = kInlineIsSmi
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
