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

Unified Diff: runtime/vm/intermediate_language.h

Issue 10332139: Fix a pair of flow graph construction issues. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 7 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 | « runtime/vm/flow_graph_builder.cc ('k') | runtime/vm/intermediate_language.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language.h
diff --git a/runtime/vm/intermediate_language.h b/runtime/vm/intermediate_language.h
index 3a9160d0b491c3724e0bdb5b39598c4fe60ee35d..44ce44874e27b49c4a24f04cc757072f3a4a86a8 100644
--- a/runtime/vm/intermediate_language.h
+++ b/runtime/vm/intermediate_language.h
@@ -1526,13 +1526,11 @@ class ThrowInstr : public Instruction {
intptr_t try_index() const { return try_index_; }
Value* exception() const { return exception_; }
- // Parser can generate a throw within an expression tree.
- virtual Instruction* StraightLineSuccessor() const {
- return successor_;
- }
+ // Parser can generate a throw within an expression tree. We never
+ // add successor instructions to the graph.
+ virtual Instruction* StraightLineSuccessor() const { return NULL; }
virtual void SetSuccessor(Instruction* instr) {
ASSERT(successor_ == NULL);
- successor_ = instr;
}
private:
@@ -1567,13 +1565,13 @@ class ReThrowInstr : public Instruction {
Value* exception() const { return exception_; }
Value* stack_trace() const { return stack_trace_; }
- // Parser can generate a rethrow within an expression tree.
+ // Parser can generate a rethrow within an expression tree. We
+ // never add successor instructions to the graph.
virtual Instruction* StraightLineSuccessor() const {
- return successor_;
+ return NULL;
}
virtual void SetSuccessor(Instruction* instr) {
ASSERT(successor_ == NULL);
- successor_ = instr;
}
private:
« no previous file with comments | « runtime/vm/flow_graph_builder.cc ('k') | runtime/vm/intermediate_language.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698