Index: lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
===================================================================
--- lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
+++ lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
@@ -206,13 +206,18 @@
   Optional<wasm::ValType> ParseType(const StringRef &Type) {
     // FIXME: can't use StringSwitch because wasm::ValType doesn't have a
     // "invalid" value.
-    if (Type == "i32") return wasm::ValType::I32;
-    if (Type == "i64") return wasm::ValType::I64;
-    if (Type == "f32") return wasm::ValType::F32;
-    if (Type == "f64") return wasm::ValType::F64;
+    if (Type == "i32")
+      return wasm::ValType::I32;
+    if (Type == "i64")
+      return wasm::ValType::I64;
+    if (Type == "f32")
+      return wasm::ValType::F32;
+    if (Type == "f64")
+      return wasm::ValType::F64;
     if (Type == "v128" || Type == "i8x16" || Type == "i16x8" ||
         Type == "i32x4" || Type == "i64x2" || Type == "f32x4" ||
-        Type == "f64x2") return wasm::ValType::V128;
+        Type == "f64x2")
+      return wasm::ValType::V128;
     return Optional<wasm::ValType>();
   }
 
@@ -277,7 +282,8 @@
     for (;;) {
       auto &Sep = Lexer.getTok();
       if (Sep.getLoc().getPointer() != Name.end() ||
-          Sep.getKind() != AsmToken::Slash) break;
+          Sep.getKind() != AsmToken::Slash)
+        break;
       // Extend name with /
       Name = StringRef(Name.begin(), Name.size() + Sep.getString().size());
       Parser.Lex();
@@ -375,20 +381,23 @@
     // consumed, otherwise this will not signal an error to the caller.
     if (DirectiveID.getString() == ".globaltype") {
       auto SymName = ExpectIdent();
-      if (SymName.empty()) return true;
-      if (Expect(AsmToken::Comma, ",")) return true;
+      if (SymName.empty())
+        return true;
+      if (Expect(AsmToken::Comma, ","))
+        return true;
       auto TypeTok = Lexer.getTok();
       auto TypeName = ExpectIdent();
-      if (TypeName.empty()) return true;
+      if (TypeName.empty())
+        return true;
       auto Type = ParseType(TypeName);
       if (!Type)
         return Error("Unknown type in .globaltype directive: ", TypeTok);
       // Now set this symbol with the correct type.
       auto WasmSym = cast<MCSymbolWasm>(
-                    TOut.getStreamer().getContext().getOrCreateSymbol(SymName));
+          TOut.getStreamer().getContext().getOrCreateSymbol(SymName));
       WasmSym->setType(wasm::WASM_SYMBOL_TYPE_GLOBAL);
       WasmSym->setGlobalType(
-            wasm::WasmGlobalType{uint8_t(Type.getValue()), true});
+          wasm::WasmGlobalType{uint8_t(Type.getValue()), true});
       // And emit the directive again.
       TOut.emitGlobalType(WasmSym);
       return Expect(AsmToken::EndOfStatement, "EOL");
@@ -399,21 +408,29 @@
       // assembler and backend really don't share any common code, and this code
       // parses the locals seperately.
       auto SymName = ExpectIdent();
-      if (SymName.empty()) return true;
+      if (SymName.empty())
+        return true;
       auto WasmSym = cast<MCSymbolWasm>(
-                    TOut.getStreamer().getContext().getOrCreateSymbol(SymName));
+          TOut.getStreamer().getContext().getOrCreateSymbol(SymName));
       if (CurrentState == Label && WasmSym == LastLabel) {
         // This .functype indicates a start of a function.
         CurrentState = FunctionStart;
       }
       auto Signature = make_unique<wasm::WasmSignature>();
-      if (Expect(AsmToken::LParen, "(")) return true;
-      if (ParseRegTypeList(Signature->Params)) return true;
-      if (Expect(AsmToken::RParen, ")")) return true;
-      if (Expect(AsmToken::MinusGreater, "->")) return true;
-      if (Expect(AsmToken::LParen, "(")) return true;
-      if (ParseRegTypeList(Signature->Returns)) return true;
-      if (Expect(AsmToken::RParen, ")")) return true;
+      if (Expect(AsmToken::LParen, "("))
+        return true;
+      if (ParseRegTypeList(Signature->Params))
+        return true;
+      if (Expect(AsmToken::RParen, ")"))
+        return true;
+      if (Expect(AsmToken::MinusGreater, "->"))
+        return true;
+      if (Expect(AsmToken::LParen, "("))
+        return true;
+      if (ParseRegTypeList(Signature->Returns))
+        return true;
+      if (Expect(AsmToken::RParen, ")"))
+        return true;
       WasmSym->setSignature(Signature.get());
       addSignature(std::move(Signature));
       WasmSym->setType(wasm::WASM_SYMBOL_TYPE_FUNCTION);
@@ -425,12 +442,13 @@
         return Error(".local directive should follow the start of a function",
                      Lexer.getTok());
       SmallVector<wasm::ValType, 4> Locals;
-      if (ParseRegTypeList(Locals)) return true;
+      if (ParseRegTypeList(Locals))
+        return true;
       TOut.emitLocal(Locals);
       CurrentState = FunctionLocals;
       return Expect(AsmToken::EndOfStatement, "EOL");
     }
-    return true;  // We didn't process this directive.
+    return true; // We didn't process this directive.
   }
 
   bool MatchAndEmitInstruction(SMLoc IDLoc, unsigned & /*Opcode*/,