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

S390: Correctly annotate eval origin.

Browse Source 
Port 89d7bfda0d

Original commit message:
        There were a couple of issues with it:
        - interpreter is not supported
        - the source position was just accidentally correct for full-codegen
        - the eval origin could have been cached

        Also fixes a few other places to use AbstractCode.

R=yangguo@chromium.org, joransiu@ca.ibm.com, mbrandy@us.ibm.com, michael_dawson@ca.ibm.com, bjaideep@ca.ibm.com
BUG=

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

Cr-Commit-Position: refs/heads/master@{#35595}
This commit is contained in:
jyan 2016-04-18 11:10:13 -07:00 committed by Commit bot
parent be9b87aafc
commit 7d9f917d65
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/full-codegen/s390/full-codegen-s390.cc
View File

@ -2498,7 +2498,8 @@ void FullCodeGenerator::EmitCall(Call* expr, ConvertReceiverMode mode) {
context()->DropAndPlug(1, r2);
}
void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) {
void FullCodeGenerator::EmitResolvePossiblyDirectEval(Call* expr) {
int arg_count = expr->arguments()->length();
// r6: copy of the first argument or undefined if it doesn't exist.
if (arg_count > 0) {
__ LoadP(r6, MemOperand(sp, arg_count * kPointerSize), r0);
@ -2515,8 +2516,11 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) {
// r3: the start position of the scope the calls resides in.
__ LoadSmiLiteral(r3, Smi::FromInt(scope()->start_position()));
// r2: the source position of the eval call.
__ LoadSmiLiteral(r2, Smi::FromInt(expr->position()));
// Do the runtime call.
__ Push(r6, r5, r4, r3);
__ Push(r6, r5, r4, r3, r2);
__ CallRuntime(Runtime::kResolvePossiblyDirectEval);
}
@ -2562,9 +2566,9 @@ void FullCodeGenerator::PushCalleeAndWithBaseObject(Call* expr) {
}
void FullCodeGenerator::EmitPossiblyEvalCall(Call* expr) {
// In a call to eval, we first call RuntimeHidden_ResolvePossiblyDirectEval
// to resolve the function we need to call. Then we call the resolved
// function using the given arguments.
// In a call to eval, we first call
// Runtime_ResolvePossiblyDirectEval to resolve the function we need
// to call. Then we call the resolved function using the given arguments.
ZoneList<Expression*>* args = expr->arguments();
int arg_count = args->length();