Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(346)

Unified Diff: src/compiler/bytecode-graph-builder.cc

Issue 2379043002: [ignition] BytecodeGraphBuilder: Merge correct environment in try block (Closed)
Patch Set: Add a global lookup test too Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/mjsunit/regress/regress-crbug-651403.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/compiler/bytecode-graph-builder.cc
diff --git a/src/compiler/bytecode-graph-builder.cc b/src/compiler/bytecode-graph-builder.cc
index 634085b8ef8ccd42144a83c4c48ab720618cdf38..e6ed264672f6d5a8230f90d849c8866408f4b4fe 100644
--- a/src/compiler/bytecode-graph-builder.cc
+++ b/src/compiler/bytecode-graph-builder.cc
@@ -906,18 +906,16 @@ void BytecodeGraphBuilder::BuildLdaLookupContextSlot(TypeofMode typeof_mode) {
extension_slot, jsgraph()->TheHoleConstant());
NewBranch(check_no_extension);
- Environment* false_environment = environment();
Environment* true_environment = environment()->CopyForConditional();
{
- set_environment(false_environment);
NewIfFalse();
// If there is an extension, merge into the slow path.
if (slow_environment == nullptr) {
- slow_environment = false_environment;
+ slow_environment = environment();
NewMerge();
} else {
- slow_environment->Merge(false_environment);
+ slow_environment->Merge(environment());
}
}
@@ -956,7 +954,7 @@ void BytecodeGraphBuilder::BuildLdaLookupContextSlot(TypeofMode typeof_mode) {
environment()->BindAccumulator(value, &states);
}
- fast_environment->Merge(slow_environment);
+ fast_environment->Merge(environment());
set_environment(fast_environment);
}
« no previous file with comments | « no previous file | test/mjsunit/regress/regress-crbug-651403.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698