From 33ba31275e5a62a09f25a2905ec48e23ffb5a274 Mon Sep 17 00:00:00 2001 From: bjaideep Date: Wed, 31 May 2017 13:18:37 -0700 Subject: [PATCH] PPC/s390: [compiler] Ask compilation info, not isolate, about source positions flag. Port 510ebfc3938883435220879ccaeea5109ecf7552 Port 8f61fbc671018e36f56637e9da3ac494dbb9afbc R=neis@chromium.org, joransiu@ca.ibm.com, jyan@ca.ibm.com, michael_dawson@ca.ibm.com BUG= LOG=N Review-Url: https://codereview.chromium.org/2920523002 Cr-Commit-Position: refs/heads/master@{#45648} --- src/compiler/ppc/code-generator-ppc.cc | 4 ++-- src/compiler/s390/code-generator-s390.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/ppc/code-generator-ppc.cc b/src/compiler/ppc/code-generator-ppc.cc index e3fddd0dbc..d9615683d2 100644 --- a/src/compiler/ppc/code-generator-ppc.cc +++ b/src/compiler/ppc/code-generator-ppc.cc @@ -2081,7 +2081,7 @@ void CodeGenerator::AssembleArchTrap(Instruction* instr, __ Ret(); } else { gen_->AssembleSourcePosition(instr_); - __ Call(handle(isolate()->builtins()->builtin(trap_id), isolate()), + __ Call(isolate()->builtins()->builtin_handle(trap_id), RelocInfo::CODE_TARGET); ReferenceMap* reference_map = new (gen_->zone()) ReferenceMap(gen_->zone()); @@ -2219,7 +2219,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleDeoptimizerCall( // actual final call site and just bl'ing to it here, similar to what we do // in the lithium backend. if (deopt_entry == nullptr) return kTooManyDeoptimizationBailouts; - if (isolate()->NeedsSourcePositionsForProfiling()) { + if (info()->is_source_positions_enabled()) { __ RecordDeoptReason(deoptimization_reason, pos, deoptimization_id); } __ Call(deopt_entry, RelocInfo::RUNTIME_ENTRY); diff --git a/src/compiler/s390/code-generator-s390.cc b/src/compiler/s390/code-generator-s390.cc index dd912b636f..d06805786b 100644 --- a/src/compiler/s390/code-generator-s390.cc +++ b/src/compiler/s390/code-generator-s390.cc @@ -2497,7 +2497,7 @@ void CodeGenerator::AssembleArchTrap(Instruction* instr, __ Ret(); } else { gen_->AssembleSourcePosition(instr_); - __ Call(handle(isolate()->builtins()->builtin(trap_id), isolate()), + __ Call(isolate()->builtins()->builtin_handle(trap_id), RelocInfo::CODE_TARGET); ReferenceMap* reference_map = new (gen_->zone()) ReferenceMap(gen_->zone()); @@ -2607,7 +2607,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleDeoptimizerCall( // actual final call site and just bl'ing to it here, similar to what we do // in the lithium backend. if (deopt_entry == nullptr) return kTooManyDeoptimizationBailouts; - if (isolate()->NeedsSourcePositionsForProfiling()) { + if (info()->is_source_positions_enabled()) { __ RecordDeoptReason(deoptimization_reason, pos, deoptimization_id); } __ Call(deopt_entry, RelocInfo::RUNTIME_ENTRY);