Anonymous avatar Anonymous committed 097041d

Serializer Now uses the correct exit block when processing the exit branch of BLOCKS followed by CONTINUE or BREAK without body

Comments (0)

Files changed (1)

lib/axtor/pass/Serializer.cpp

 								(itNode + 2) == node->end() &&
 								(*(itNode + 1))->getEntryBlock() == 0
 						) {
-							nextExitBlock = exitBlock;
+							ast::ControlNode * nextNode = *(itNode + 1);
+							// TODO clean this up
+							switch (nextNode->getType())
+							{
+							case ast::ControlNode::CONTINUE:
+								assert(loopHeader && "can not CONTINUE w/o loop header");
+								nextExitBlock = loopHeader; break;
+
+							case ast::ControlNode::BREAK:
+								assert(loopExit && "can not BREAK w/o loop exit");
+								nextExitBlock = loopExit; break;
+
+							default:
+								nextExitBlock = exitBlock; break;
+							}
 
 						// inner node case
 						} else {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.