Skip to content

V
V8
Commit cf1c4911 authored by svenpanne's avatar svenpanne Committed by Commit bot
Browse files
Options

Remove BLACKLIST from check-name-clashes.py, it's wrong nowadays. 

Fix the resulting warnings by renaming things apart.

BUG=v8:3947
LOG=n

Review URL: https://codereview.chromium.org/1009373002

Cr-Commit-Position: refs/heads/master@{#27219}
parent 82fe1adf
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 47 deletions
src/arm/code-stubs-arm.cc
View file @ cf1c4911
...@@ -1964,7 +1964,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -1964,7 +1964,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or // time or if regexp entry in generated code is turned off runtime switch or
// at compilation. // at compilation.
#ifdef V8_INTERPRETED_REGEXP #ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP #else // V8_INTERPRETED_REGEXP
// Stack frame on entry. // Stack frame on entry.
...@@ -2331,7 +2331,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -2331,7 +2331,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp. // Do the runtime call to execute the regexp.
__ bind(&runtime); __ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling. // Deferred code for string handling.
// (6) Not a long external string? If yes, go to (8). // (6) Not a long external string? If yes, go to (8).
......
src/arm64/code-stubs-arm64.cc
View file @ cf1c4911
...@@ -2228,7 +2228,7 @@ void RestParamAccessStub::GenerateNew(MacroAssembler* masm) { ...@@ -2228,7 +2228,7 @@ void RestParamAccessStub::GenerateNew(MacroAssembler* masm) {
void RegExpExecStub::Generate(MacroAssembler* masm) { void RegExpExecStub::Generate(MacroAssembler* masm) {
#ifdef V8_INTERPRETED_REGEXP #ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP #else // V8_INTERPRETED_REGEXP
// Stack frame on entry. // Stack frame on entry.
...@@ -2693,7 +2693,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -2693,7 +2693,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
__ Bind(&runtime); __ Bind(&runtime);
__ PopCPURegList(used_callee_saved_registers); __ PopCPURegList(used_callee_saved_registers);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling. // Deferred code for string handling.
// (6) Not a long external string? If yes, go to (8). // (6) Not a long external string? If yes, go to (8).
......
src/ia32/code-stubs-ia32.cc
View file @ cf1c4911
...@@ -1238,7 +1238,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -1238,7 +1238,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or // time or if regexp entry in generated code is turned off runtime switch or
// at compilation. // at compilation.
#ifdef V8_INTERPRETED_REGEXP #ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP #else // V8_INTERPRETED_REGEXP
// Stack frame on entry. // Stack frame on entry.
...@@ -1609,7 +1609,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -1609,7 +1609,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp. // Do the runtime call to execute the regexp.
__ bind(&runtime); __ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling. // Deferred code for string handling.
// (7) Not a long external string? If yes, go to (10). // (7) Not a long external string? If yes, go to (10).
......
src/math.js
View file @ cf1c4911
...@@ -61,7 +61,7 @@ function MathExp(x) { ...@@ -61,7 +61,7 @@ function MathExp(x) {
} }
// ECMA 262 - 15.8.2.9 // ECMA 262 - 15.8.2.9
function MathFloor(x) { function MathFloorJS(x) {
return %_MathFloor(+x); return %_MathFloor(+x);
} }
...@@ -125,7 +125,7 @@ function MathMin(arg1, arg2) { // length == 2 ...@@ -125,7 +125,7 @@ function MathMin(arg1, arg2) { // length == 2
} }
// ECMA 262 - 15.8.2.13 // ECMA 262 - 15.8.2.13
function MathPow(x, y) { function MathPowJS(x, y) {
return %_MathPow(TO_NUMBER_INLINE(x), TO_NUMBER_INLINE(y)); return %_MathPow(TO_NUMBER_INLINE(x), TO_NUMBER_INLINE(y));
} }
...@@ -146,7 +146,7 @@ function MathRound(x) { ...@@ -146,7 +146,7 @@ function MathRound(x) {
} }
// ECMA 262 - 15.8.2.17 // ECMA 262 - 15.8.2.17
function MathSqrt(x) { function MathSqrtJS(x) {
return %_MathSqrt(+x); return %_MathSqrt(+x);
} }
...@@ -167,7 +167,7 @@ function MathSign(x) { ...@@ -167,7 +167,7 @@ function MathSign(x) {
// ES6 draft 09-27-13, section 20.2.2.34. // ES6 draft 09-27-13, section 20.2.2.34.
function MathTrunc(x) { function MathTrunc(x) {
x = TO_NUMBER_INLINE(x); x = TO_NUMBER_INLINE(x);
if (x > 0) return MathFloor(x); if (x > 0) return MathFloorJS(x);
if (x < 0) return MathCeil(x); if (x < 0) return MathCeil(x);
// -0, 0 or NaN. // -0, 0 or NaN.
return x; return x;
...@@ -280,7 +280,7 @@ macro NEWTON_ITERATION_CBRT(x, approx) ...@@ -280,7 +280,7 @@ macro NEWTON_ITERATION_CBRT(x, approx)
endmacro endmacro
function CubeRoot(x) { function CubeRoot(x) {
var approx_hi = MathFloor(%_DoubleHi(x) / 3) + 0x2A9F7893; var approx_hi = MathFloorJS(%_DoubleHi(x) / 3) + 0x2A9F7893;
var approx = %_ConstructDouble(approx_hi, 0); var approx = %_ConstructDouble(approx_hi, 0);
approx = NEWTON_ITERATION_CBRT(x, approx); approx = NEWTON_ITERATION_CBRT(x, approx);
approx = NEWTON_ITERATION_CBRT(x, approx); approx = NEWTON_ITERATION_CBRT(x, approx);
...@@ -328,12 +328,12 @@ InstallFunctions(Math, DONT_ENUM, GlobalArray( ...@@ -328,12 +328,12 @@ InstallFunctions(Math, DONT_ENUM, GlobalArray(
"atan", MathAtanJS, "atan", MathAtanJS,
"ceil", MathCeil, "ceil", MathCeil,
"exp", MathExp, "exp", MathExp,
"floor", MathFloor, "floor", MathFloorJS,
"log", MathLog, "log", MathLog,
"round", MathRound, "round", MathRound,
"sqrt", MathSqrt, "sqrt", MathSqrtJS,
"atan2", MathAtan2JS, "atan2", MathAtan2JS,
"pow", MathPow, "pow", MathPowJS,
"max", MathMax, "max", MathMax,
"min", MathMin, "min", MathMin,
"imul", MathImul, "imul", MathImul,
...@@ -351,14 +351,14 @@ InstallFunctions(Math, DONT_ENUM, GlobalArray( ...@@ -351,14 +351,14 @@ InstallFunctions(Math, DONT_ENUM, GlobalArray(
%SetInlineBuiltinFlag(MathAbs); %SetInlineBuiltinFlag(MathAbs);
%SetInlineBuiltinFlag(MathCeil); %SetInlineBuiltinFlag(MathCeil);
%SetInlineBuiltinFlag(MathFloor); %SetInlineBuiltinFlag(MathFloorJS);
%SetInlineBuiltinFlag(MathRandom); %SetInlineBuiltinFlag(MathRandom);
%SetInlineBuiltinFlag(MathSqrt); %SetInlineBuiltinFlag(MathSqrtJS);
// Expose to the global scope. // Expose to the global scope.
$abs = MathAbs; $abs = MathAbs;
$exp = MathExp; $exp = MathExp;
$floor = MathFloor; $floor = MathFloorJS;
$max = MathMax; $max = MathMax;
$min = MathMin; $min = MathMin;
......
src/mips/code-stubs-mips.cc
View file @ cf1c4911
...@@ -2087,7 +2087,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -2087,7 +2087,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or // time or if regexp entry in generated code is turned off runtime switch or
// at compilation. // at compilation.
#ifdef V8_INTERPRETED_REGEXP #ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP #else // V8_INTERPRETED_REGEXP
// Stack frame on entry. // Stack frame on entry.
...@@ -2469,7 +2469,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -2469,7 +2469,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp. // Do the runtime call to execute the regexp.
__ bind(&runtime); __ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling. // Deferred code for string handling.
// (6) Not a long external string? If yes, go to (8). // (6) Not a long external string? If yes, go to (8).
......
src/mips64/code-stubs-mips64.cc
View file @ cf1c4911
...@@ -2091,7 +2091,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -2091,7 +2091,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or // time or if regexp entry in generated code is turned off runtime switch or
// at compilation. // at compilation.
#ifdef V8_INTERPRETED_REGEXP #ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP #else // V8_INTERPRETED_REGEXP
// Stack frame on entry. // Stack frame on entry.
...@@ -2505,7 +2505,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -2505,7 +2505,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp. // Do the runtime call to execute the regexp.
__ bind(&runtime); __ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling. // Deferred code for string handling.
// (6) Not a long external string? If yes, go to (8). // (6) Not a long external string? If yes, go to (8).
......
src/ppc/code-stubs-ppc.cc
View file @ cf1c4911
...@@ -2106,7 +2106,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -2106,7 +2106,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or // time or if regexp entry in generated code is turned off runtime switch or
// at compilation. // at compilation.
#ifdef V8_INTERPRETED_REGEXP #ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP #else // V8_INTERPRETED_REGEXP
// Stack frame on entry. // Stack frame on entry.
...@@ -2491,7 +2491,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -2491,7 +2491,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp. // Do the runtime call to execute the regexp.
__ bind(&runtime); __ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling. // Deferred code for string handling.
// (6) Not a long external string? If yes, go to (8). // (6) Not a long external string? If yes, go to (8).
......
src/regexp.js
View file @ cf1c4911
...@@ -145,7 +145,7 @@ function RegExpExecNoTests(regexp, string, start) { ...@@ -145,7 +145,7 @@ function RegExpExecNoTests(regexp, string, start) {
} }
function RegExpExec(string) { function RegExpExecJS(string) {
if (!IS_REGEXP(this)) { if (!IS_REGEXP(this)) {
throw MakeTypeError('incompatible_method_receiver', throw MakeTypeError('incompatible_method_receiver',
['RegExp.prototype.exec', this]); ['RegExp.prototype.exec', this]);
...@@ -365,7 +365,7 @@ function RegExpMakeCaptureGetter(n) { ...@@ -365,7 +365,7 @@ function RegExpMakeCaptureGetter(n) {
%SetCode(GlobalRegExp, RegExpConstructor); %SetCode(GlobalRegExp, RegExpConstructor);
InstallFunctions(GlobalRegExp.prototype, DONT_ENUM, GlobalArray( InstallFunctions(GlobalRegExp.prototype, DONT_ENUM, GlobalArray(
"exec", RegExpExec, "exec", RegExpExecJS,
"test", RegExpTest, "test", RegExpTest,
"toString", RegExpToString, "toString", RegExpToString,
"compile", RegExpCompileJS "compile", RegExpCompileJS
......
src/runtime/runtime-regexp.cc
View file @ cf1c4911
...@@ -759,7 +759,7 @@ RUNTIME_FUNCTION(Runtime_StringSplit) { ...@@ -759,7 +759,7 @@ RUNTIME_FUNCTION(Runtime_StringSplit) {
} }
RUNTIME_FUNCTION(Runtime_RegExpExecRT) { RUNTIME_FUNCTION(Runtime_RegExpExec) {
HandleScope scope(isolate); HandleScope scope(isolate);
DCHECK(args.length() == 4); DCHECK(args.length() == 4);
CONVERT_ARG_HANDLE_CHECKED(JSRegExp, regexp, 0); CONVERT_ARG_HANDLE_CHECKED(JSRegExp, regexp, 0);
...@@ -1110,12 +1110,6 @@ RUNTIME_FUNCTION(Runtime_RegExpExecMultiple) { ...@@ -1110,12 +1110,6 @@ RUNTIME_FUNCTION(Runtime_RegExpExecMultiple) {
} }
RUNTIME_FUNCTION(Runtime_RegExpExec) {
SealHandleScope shs(isolate);
return __RT_impl_Runtime_RegExpExecRT(args, isolate);
}
RUNTIME_FUNCTION(Runtime_IsRegExp) { RUNTIME_FUNCTION(Runtime_IsRegExp) {
SealHandleScope shs(isolate); SealHandleScope shs(isolate);
DCHECK(args.length() == 1); DCHECK(args.length() == 1);
......
src/runtime/runtime.h
View file @ cf1c4911
...@@ -427,7 +427,6 @@ namespace internal { ...@@ -427,7 +427,6 @@ namespace internal {
/* String and Regexp */ \ /* String and Regexp */ \
F(NumberToStringRT, 1, 1) \ F(NumberToStringRT, 1, 1) \
F(RegExpConstructResultRT, 3, 1) \ F(RegExpConstructResultRT, 3, 1) \
F(RegExpExecRT, 4, 1) \
F(StringAddRT, 2, 1) \ F(StringAddRT, 2, 1) \
F(SubStringRT, 3, 1) \ F(SubStringRT, 3, 1) \
F(InternalizeString, 1, 1) \ F(InternalizeString, 1, 1) \
......
src/string.js
View file @ cf1c4911
...@@ -46,7 +46,7 @@ function StringValueOf() { ...@@ -46,7 +46,7 @@ function StringValueOf() {
// ECMA-262, section 15.5.4.4 // ECMA-262, section 15.5.4.4
function StringCharAt(pos) { function StringCharAtJS(pos) {
CHECK_OBJECT_COERCIBLE(this, "String.prototype.charAt"); CHECK_OBJECT_COERCIBLE(this, "String.prototype.charAt");
var result = %_StringCharAt(this, pos); var result = %_StringCharAt(this, pos);
...@@ -58,7 +58,7 @@ function StringCharAt(pos) { ...@@ -58,7 +58,7 @@ function StringCharAt(pos) {
// ECMA-262 section 15.5.4.5 // ECMA-262 section 15.5.4.5
function StringCharCodeAt(pos) { function StringCharCodeAtJS(pos) {
CHECK_OBJECT_COERCIBLE(this, "String.prototype.charCodeAt"); CHECK_OBJECT_COERCIBLE(this, "String.prototype.charCodeAt");
var result = %_StringCharCodeAt(this, pos); var result = %_StringCharCodeAt(this, pos);
...@@ -950,8 +950,8 @@ InstallFunctions(GlobalString, DONT_ENUM, GlobalArray( ...@@ -950,8 +950,8 @@ InstallFunctions(GlobalString, DONT_ENUM, GlobalArray(
InstallFunctions(GlobalString.prototype, DONT_ENUM, GlobalArray( InstallFunctions(GlobalString.prototype, DONT_ENUM, GlobalArray(
"valueOf", StringValueOf, "valueOf", StringValueOf,
"toString", StringToString, "toString", StringToString,
"charAt", StringCharAt, "charAt", StringCharAtJS,
"charCodeAt", StringCharCodeAt, "charCodeAt", StringCharCodeAtJS,
"concat", StringConcat, "concat", StringConcat,
"indexOf", StringIndexOfJS, "indexOf", StringIndexOfJS,
"lastIndexOf", StringLastIndexOfJS, "lastIndexOf", StringLastIndexOfJS,
...@@ -986,7 +986,7 @@ InstallFunctions(GlobalString.prototype, DONT_ENUM, GlobalArray( ...@@ -986,7 +986,7 @@ InstallFunctions(GlobalString.prototype, DONT_ENUM, GlobalArray(
"sup", StringSup "sup", StringSup
)); ));
$stringCharAt = StringCharAt; $stringCharAt = StringCharAtJS;
$stringIndexOf = StringIndexOfJS; $stringIndexOf = StringIndexOfJS;
$stringSubstring = StringSubstring; $stringSubstring = StringSubstring;
......
src/v8natives.js
View file @ cf1c4911
...@@ -1522,7 +1522,7 @@ function NumberConstructor(x) { ...@@ -1522,7 +1522,7 @@ function NumberConstructor(x) {
// ECMA-262 section 15.7.4.2. // ECMA-262 section 15.7.4.2.
function NumberToString(radix) { function NumberToStringJS(radix) {
// NOTE: Both Number objects and values can enter here as // NOTE: Both Number objects and values can enter here as
// 'this'. This is not as dictated by ECMA-262. // 'this'. This is not as dictated by ECMA-262.
var number = this; var number = this;
...@@ -1550,7 +1550,7 @@ function NumberToString(radix) { ...@@ -1550,7 +1550,7 @@ function NumberToString(radix) {
// ECMA-262 section 15.7.4.3 // ECMA-262 section 15.7.4.3
function NumberToLocaleString() { function NumberToLocaleString() {
return %_CallFunction(this, NumberToString); return %_CallFunction(this, NumberToStringJS);
} }
...@@ -1702,7 +1702,7 @@ function SetUpNumber() { ...@@ -1702,7 +1702,7 @@ function SetUpNumber() {
// Set up non-enumerable functions on the Number prototype object. // Set up non-enumerable functions on the Number prototype object.
InstallFunctions($Number.prototype, DONT_ENUM, $Array( InstallFunctions($Number.prototype, DONT_ENUM, $Array(
"toString", NumberToString, "toString", NumberToStringJS,
"toLocaleString", NumberToLocaleString, "toLocaleString", NumberToLocaleString,
"valueOf", NumberValueOf, "valueOf", NumberValueOf,
"toFixed", NumberToFixedJS, "toFixed", NumberToFixedJS,
......
src/x64/code-stubs-x64.cc
View file @ cf1c4911
...@@ -1096,7 +1096,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -1096,7 +1096,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or // time or if regexp entry in generated code is turned off runtime switch or
// at compilation. // at compilation.
#ifdef V8_INTERPRETED_REGEXP #ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP #else // V8_INTERPRETED_REGEXP
// Stack frame on entry. // Stack frame on entry.
...@@ -1484,7 +1484,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -1484,7 +1484,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp. // Do the runtime call to execute the regexp.
__ bind(&runtime); __ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling. // Deferred code for string handling.
// (7) Not a long external string? If yes, go to (10). // (7) Not a long external string? If yes, go to (10).
......
src/x87/code-stubs-x87.cc
View file @ cf1c4911
...@@ -919,7 +919,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -919,7 +919,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or // time or if regexp entry in generated code is turned off runtime switch or
// at compilation. // at compilation.
#ifdef V8_INTERPRETED_REGEXP #ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP #else // V8_INTERPRETED_REGEXP
// Stack frame on entry. // Stack frame on entry.
...@@ -1284,7 +1284,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -1284,7 +1284,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp. // Do the runtime call to execute the regexp.
__ bind(&runtime); __ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling. // Deferred code for string handling.
// (7) Not a long external string? If yes, go to (10). // (7) Not a long external string? If yes, go to (10).
......
tools/check-name-clashes.py
View file @ cf1c4911
...@@ -11,7 +11,6 @@ import sys ...@@ -11,7 +11,6 @@ import sys
FILENAME = "src/runtime/runtime.h" FILENAME = "src/runtime/runtime.h"
LISTHEAD = re.compile(r"#define\s+(\w+LIST\w*)\((\w+)\)") LISTHEAD = re.compile(r"#define\s+(\w+LIST\w*)\((\w+)\)")
LISTBODY = re.compile(r".*\\$") LISTBODY = re.compile(r".*\\$")
BLACKLIST = ['INLINE_FUNCTION_LIST', 'INLINE_OPTIMIZED_FUNCTION_LIST']
class Function(object): class Function(object):
...@@ -32,7 +31,7 @@ def FindLists(filename): ...@@ -32,7 +31,7 @@ def FindLists(filename):
for line in f: for line in f:
if mode == "SEARCHING": if mode == "SEARCHING":
match = LISTHEAD.match(line) match = LISTHEAD.match(line)
if match and match.group(1) not in BLACKLIST: if match:
mode = "APPENDING" mode = "APPENDING"
current_list.append(line) current_list.append(line)
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment