Revert "clang-format"

This reverts commit aafe571a82e1f97acf1a3505eddaea8e63db1dfa.

Author: thurstond

clang/lib/CodeGen/CGExpr.cpp

@@ -3930,7 +3930,7 @@ void CodeGenFunction::EmitTrapCheck(llvm::Value *Checked,
       TrapCall->addFnAttr(A);
     }
     if (!NewTrapBB)
-      TrapCall->addFnAttr(llvm::Attribute::NoMerge);
+        TrapCall->addFnAttr(llvm::Attribute::NoMerge);
     TrapCall->setDoesNotReturn();
     TrapCall->setDoesNotThrow();
     Builder.CreateUnreachable();