AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

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

Browse Source 
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}
This commit is contained in:
svenpanne 2015-03-16 06:08:42 -07:00 committed by Commit bot
parent 82fe1adfed
commit cf1c4911b9
15 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arm/code-stubs-arm.cc
View File

@ -1964,7 +1964,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or
// at compilation.
#ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP
// Stack frame on entry.
@ -2331,7 +2331,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp.
__ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling.
// (6) Not a long external string? If yes, go to (8).

4
src/arm64/code-stubs-arm64.cc
View File

@ -2228,7 +2228,7 @@ void RestParamAccessStub::GenerateNew(MacroAssembler* masm) {
void RegExpExecStub::Generate(MacroAssembler* masm) {
#ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP
// Stack frame on entry.
@ -2693,7 +2693,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
__ Bind(&runtime);
__ PopCPURegList(used_callee_saved_registers);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling.
// (6) Not a long external string? If yes, go to (8).

4
src/ia32/code-stubs-ia32.cc
View File

@ -1238,7 +1238,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or
// at compilation.
#ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP
// Stack frame on entry.
@ -1609,7 +1609,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp.
__ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling.
// (7) Not a long external string? If yes, go to (10).

22
src/math.js
View File

@ -61,7 +61,7 @@ function MathExp(x) {
}
// ECMA 262 - 15.8.2.9
function MathFloor(x) {
function MathFloorJS(x) {
return %_MathFloor(+x);
}
@ -125,7 +125,7 @@ function MathMin(arg1, arg2) { // length == 2
}
// ECMA 262 - 15.8.2.13
function MathPow(x, y) {
function MathPowJS(x, y) {
return %_MathPow(TO_NUMBER_INLINE(x), TO_NUMBER_INLINE(y));
}
@ -146,7 +146,7 @@ function MathRound(x) {
}
// ECMA 262 - 15.8.2.17
function MathSqrt(x) {
function MathSqrtJS(x) {
return %_MathSqrt(+x);
}
@ -167,7 +167,7 @@ function MathSign(x) {
// ES6 draft 09-27-13, section 20.2.2.34.
function MathTrunc(x) {
x = TO_NUMBER_INLINE(x);
if (x > 0) return MathFloor(x);
if (x > 0) return MathFloorJS(x);
if (x < 0) return MathCeil(x);
// -0, 0 or NaN.
return x;
@ -280,7 +280,7 @@ macro NEWTON_ITERATION_CBRT(x, approx)
endmacro
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);
approx = NEWTON_ITERATION_CBRT(x, approx);
approx = NEWTON_ITERATION_CBRT(x, approx);
@ -328,12 +328,12 @@ InstallFunctions(Math, DONT_ENUM, GlobalArray(
"atan", MathAtanJS,
"ceil", MathCeil,
"exp", MathExp,
"floor", MathFloor,
"floor", MathFloorJS,
"log", MathLog,
"round", MathRound,
"sqrt", MathSqrt,
"sqrt", MathSqrtJS,
"atan2", MathAtan2JS,
"pow", MathPow,
"pow", MathPowJS,
"max", MathMax,
"min", MathMin,
"imul", MathImul,
@ -351,14 +351,14 @@ InstallFunctions(Math, DONT_ENUM, GlobalArray(
%SetInlineBuiltinFlag(MathAbs);
%SetInlineBuiltinFlag(MathCeil);
%SetInlineBuiltinFlag(MathFloor);
%SetInlineBuiltinFlag(MathFloorJS);
%SetInlineBuiltinFlag(MathRandom);
%SetInlineBuiltinFlag(MathSqrt);
%SetInlineBuiltinFlag(MathSqrtJS);
// Expose to the global scope.
$abs = MathAbs;
$exp = MathExp;
$floor = MathFloor;
$floor = MathFloorJS;
$max = MathMax;
$min = MathMin;

4
src/mips/code-stubs-mips.cc
View File

@ -2087,7 +2087,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or
// at compilation.
#ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP
// Stack frame on entry.
@ -2469,7 +2469,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp.
__ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling.
// (6) Not a long external string? If yes, go to (8).

4
src/mips64/code-stubs-mips64.cc
View File

@ -2091,7 +2091,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or
// at compilation.
#ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP
// Stack frame on entry.
@ -2505,7 +2505,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp.
__ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling.
// (6) Not a long external string? If yes, go to (8).

4
src/ppc/code-stubs-ppc.cc
View File

@ -2106,7 +2106,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or
// at compilation.
#ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP
// Stack frame on entry.
@ -2491,7 +2491,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp.
__ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling.
// (6) Not a long external string? If yes, go to (8).

4
src/regexp.js
View File

@ -145,7 +145,7 @@ function RegExpExecNoTests(regexp, string, start) {
}
function RegExpExec(string) {
function RegExpExecJS(string) {
if (!IS_REGEXP(this)) {
throw MakeTypeError('incompatible_method_receiver',
['RegExp.prototype.exec', this]);
@ -365,7 +365,7 @@ function RegExpMakeCaptureGetter(n) {
%SetCode(GlobalRegExp, RegExpConstructor);
InstallFunctions(GlobalRegExp.prototype, DONT_ENUM, GlobalArray(
"exec", RegExpExec,
"exec", RegExpExecJS,
"test", RegExpTest,
"toString", RegExpToString,
"compile", RegExpCompileJS

8
src/runtime/runtime-regexp.cc
View File

@ -759,7 +759,7 @@ RUNTIME_FUNCTION(Runtime_StringSplit) {
}
RUNTIME_FUNCTION(Runtime_RegExpExecRT) {
RUNTIME_FUNCTION(Runtime_RegExpExec) {
HandleScope scope(isolate);
DCHECK(args.length() == 4);
CONVERT_ARG_HANDLE_CHECKED(JSRegExp, regexp, 0);
@ -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) {
SealHandleScope shs(isolate);
DCHECK(args.length() == 1);

1
src/runtime/runtime.h
View File

@ -427,7 +427,6 @@ namespace internal {
/* String and Regexp */ \
F(NumberToStringRT, 1, 1) \
F(RegExpConstructResultRT, 3, 1) \
F(RegExpExecRT, 4, 1) \
F(StringAddRT, 2, 1) \
F(SubStringRT, 3, 1) \
F(InternalizeString, 1, 1) \

10
src/string.js
View File

@ -46,7 +46,7 @@ function StringValueOf() {
// ECMA-262, section 15.5.4.4
function StringCharAt(pos) {
function StringCharAtJS(pos) {
CHECK_OBJECT_COERCIBLE(this, "String.prototype.charAt");
var result = %_StringCharAt(this, pos);
@ -58,7 +58,7 @@ function StringCharAt(pos) {
// ECMA-262 section 15.5.4.5
function StringCharCodeAt(pos) {
function StringCharCodeAtJS(pos) {
CHECK_OBJECT_COERCIBLE(this, "String.prototype.charCodeAt");
var result = %_StringCharCodeAt(this, pos);
@ -950,8 +950,8 @@ InstallFunctions(GlobalString, DONT_ENUM, GlobalArray(
InstallFunctions(GlobalString.prototype, DONT_ENUM, GlobalArray(
"valueOf", StringValueOf,
"toString", StringToString,
"charAt", StringCharAt,
"charCodeAt", StringCharCodeAt,
"charAt", StringCharAtJS,
"charCodeAt", StringCharCodeAtJS,
"concat", StringConcat,
"indexOf", StringIndexOfJS,
"lastIndexOf", StringLastIndexOfJS,
@ -986,7 +986,7 @@ InstallFunctions(GlobalString.prototype, DONT_ENUM, GlobalArray(
"sup", StringSup
));
$stringCharAt = StringCharAt;
$stringCharAt = StringCharAtJS;
$stringIndexOf = StringIndexOfJS;
$stringSubstring = StringSubstring;

6
src/v8natives.js
View File

@ -1522,7 +1522,7 @@ function NumberConstructor(x) {
// ECMA-262 section 15.7.4.2.
function NumberToString(radix) {
function NumberToStringJS(radix) {
// NOTE: Both Number objects and values can enter here as
// 'this'. This is not as dictated by ECMA-262.
var number = this;
@ -1550,7 +1550,7 @@ function NumberToString(radix) {
// ECMA-262 section 15.7.4.3
function NumberToLocaleString() {
return %_CallFunction(this, NumberToString);
return %_CallFunction(this, NumberToStringJS);
}
@ -1702,7 +1702,7 @@ function SetUpNumber() {
// Set up non-enumerable functions on the Number prototype object.
InstallFunctions($Number.prototype, DONT_ENUM, $Array(
"toString", NumberToString,
"toString", NumberToStringJS,
"toLocaleString", NumberToLocaleString,
"valueOf", NumberValueOf,
"toFixed", NumberToFixedJS,

4
src/x64/code-stubs-x64.cc
View File

@ -1096,7 +1096,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or
// at compilation.
#ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP
// Stack frame on entry.
@ -1484,7 +1484,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp.
__ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling.
// (7) Not a long external string? If yes, go to (10).

4
src/x87/code-stubs-x87.cc
View File

@ -919,7 +919,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// time or if regexp entry in generated code is turned off runtime switch or
// at compilation.
#ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_INTERPRETED_REGEXP
// Stack frame on entry.
@ -1284,7 +1284,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp.
__ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExecRT, 4, 1);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
// Deferred code for string handling.
// (7) Not a long external string? If yes, go to (10).

3
tools/check-name-clashes.py
View File

@ -11,7 +11,6 @@ import sys
FILENAME = "src/runtime/runtime.h"
LISTHEAD = re.compile(r"#define\s+(\w+LIST\w*)\((\w+)\)")
LISTBODY = re.compile(r".*\\$")
BLACKLIST = ['INLINE_FUNCTION_LIST', 'INLINE_OPTIMIZED_FUNCTION_LIST']
class Function(object):
@ -32,7 +31,7 @@ def FindLists(filename):
for line in f:
if mode == "SEARCHING":
match = LISTHEAD.match(line)
if match and match.group(1) not in BLACKLIST:
if match:
mode = "APPENDING"
current_list.append(line)
else: