update relooper and fix indentation and empty lines

2 files changed, 2 insertions, 5 deletions

diff --git a/lib/Target/CppBackend/CPPBackend.cpp b/lib/Target/CppBackend/CPPBackend.cpp
index 481c9876b6..0267a88171 100644
--- a/lib/Target/CppBackend/CPPBackend.cpp
+++ b/lib/Target/CppBackend/CPPBackend.cpp
@@ -1745,7 +1745,8 @@ void CppWriter::printFunctionBody(const Function *F) {
     std::string contents = "";
     for (BasicBlock::const_iterator I = BI->begin(), E = BI->end();
          I != E; ++I) {
-      contents += " " + generateInstruction(I) + "\n";
+      std::string curr = generateInstruction(I);
+      if (curr.size() > 0) contents += curr + "\n";
     }
     Block *Curr = new Block(contents.c_str(), NULL); // TODO: use branch vars so we get switches
     const BasicBlock *BB = &*BI;
diff --git a/lib/Target/CppBackend/Relooper.cpp b/lib/Target/CppBackend/Relooper.cpp
index 07b3631141..d2a48f6356 100644
--- a/lib/Target/CppBackend/Relooper.cpp
+++ b/lib/Target/CppBackend/Relooper.cpp
@@ -71,11 +71,7 @@ static int AsmJS = 0;
 
 // Indenter
 
-#if EMSCRIPTEN
 int Indenter::CurrIndent = 1;
-#else
-int Indenter::CurrIndent = 0;
-#endif
 
 // Branch