[WebAssembly] Fix merge conflicts

Author: kateinoigakukun

lib/Basic/Platform.cpp

@@ -138,8 +138,6 @@ static StringRef getPlatformNameForDarwin(const DarwinPlatformKind platform) {
 StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
   switch (triple.getOS()) {
   case llvm::Triple::UnknownOS:
-    if (triple.isOSBinFormatWasm())
-      return "wasm";
     llvm_unreachable("unknown OS");
   case llvm::Triple::Ananas:
   case llvm::Triple::CloudABI:

lib/IRGen/MetadataRequest.cpp

@@ -2301,9 +2301,6 @@ emitMetadataAccessByMangledName(IRGenFunction &IGF, CanType type,
                                                    stringAddrOffset);
         stringAddr = subIGF.Builder.CreateIntToPtr(stringAddr, IGM.Int8PtrTy);
       }
-      auto stringAddr = subIGF.Builder.CreateAdd(stringAddrBase,
-                                                 stringAddrOffset);
-      stringAddr = subIGF.Builder.CreateIntToPtr(stringAddr, IGM.Int8PtrTy);
 
       llvm::CallInst *call;
       if (request.isStaticallyAbstract()) {

lib/SIL/TypeLowering.cpp

@@ -2621,20 +2621,18 @@ TypeConverter::checkFunctionForABIDifferences(SILModule &M,
   if (rep1 != rep2) {
     if (rep1 == SILFunctionTypeRepresentation::Thin &&
         rep2 == SILFunctionTypeRepresentation::Thick) {
+      // There is no ABI compatibility between thin and thick on WebAssembly,
+      // so need thunk.
+      if (M.getASTContext().LangOpts.Target.isOSBinFormatWasm()) {
+        return ABIDifference::NeedsThunk;
+      }
       if (DifferentFunctionTypesHaveDifferentRepresentation) {
         // FIXME: check whether the representations are compatible modulo
         // context
         return ABIDifference::CompatibleCallingConvention_ThinToThick;
       } else {
         return ABIDifference::CompatibleRepresentation_ThinToThick;
       }
-
-      // There is no ABI compatibility between thin and thick on WebAssembly,
-      // so need thunk.
-      if (M.getASTContext().LangOpts.Target.isOSBinFormatWasm()) {
-        return ABIDifference::NeedsThunk;
-      }
-      return ABIDifference::ThinToThick;
     }
     return ABIDifference::NeedsThunk;
   }