From 0bf430c1d6d8de85a33566f959e1e39f27d7aa33 Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Wed, 25 Jun 2014 12:37:06 +0000 Subject: [PATCH] Better fix for --trace-ic source positions: Use HOptimizedGraphBuilderWithPositions This reverts the changes made in r22008. R=yangguo@chromium.org Review URL: https://codereview.chromium.org/355823003 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22012 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/compiler.cc | 2 +- src/hydrogen.cc | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/compiler.cc b/src/compiler.cc index d9fb4a9..f471224 100644 --- a/src/compiler.cc +++ b/src/compiler.cc @@ -394,7 +394,7 @@ OptimizedCompileJob::Status OptimizedCompileJob::CreateGraph() { // Type-check the function. AstTyper::Run(info()); - graph_builder_ = FLAG_hydrogen_track_positions + graph_builder_ = (FLAG_hydrogen_track_positions || FLAG_trace_ic) ? new(info()->zone()) HOptimizedGraphBuilderWithPositions(info()) : new(info()->zone()) HOptimizedGraphBuilder(info()); diff --git a/src/hydrogen.cc b/src/hydrogen.cc index df1f7a0..4e7b1a3 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -6512,7 +6512,6 @@ void HOptimizedGraphBuilder::VisitAssignment(Assignment* expr) { ASSERT(!HasStackOverflow()); ASSERT(current_block() != NULL); ASSERT(current_block()->HasPredecessor()); - if (!FLAG_hydrogen_track_positions) SetSourcePosition(expr->position()); VariableProxy* proxy = expr->target()->AsVariableProxy(); Property* prop = expr->target()->AsProperty(); ASSERT(proxy == NULL || prop == NULL); @@ -7214,8 +7213,6 @@ void HOptimizedGraphBuilder::VisitProperty(Property* expr) { ASSERT(current_block() != NULL); ASSERT(current_block()->HasPredecessor()); - if (!FLAG_hydrogen_track_positions) SetSourcePosition(expr->position()); - if (TryArgumentsAccess(expr)) return; CHECK_ALIVE(VisitForValue(expr->obj())); -- 2.7.4