mattia/pacciani
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into location

Browse Source
This commit is contained in:
Stefano Sanfilippo 2015-03-25 01:36:26 +01:00
parent 69f54847b4 3dc5dc604a
commit 5c05d96b39
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/*.user /*.user
/mcc /mcc
/build /build
/nbproject

3
src/BitcodeEmitter.cpp
View File

@ -32,6 +32,7 @@
#include <llvm/Analysis/Passes.h> #include <llvm/Analysis/Passes.h>
#include <cassert> #include <cassert>
#include <iostream>
#include <string> #include <string>
#include <map> #include <map>
#include <vector> #include <vector>
@ -496,6 +497,8 @@ bool BitcodeEmitter::emit(Branch const& node) {
if (body.getElse()) { if (body.getElse()) {
GUARDED(ensureBasicBlock(*body.getElse(), mergebb)); GUARDED(ensureBasicBlock(*body.getElse(), mergebb));
} else {
d->builder.CreateBr(mergebb);
} }
func->getBasicBlockList().push_back(mergebb); func->getBasicBlockList().push_back(mergebb);