Index: lib/CodeGen/CodeGenModule.cpp |
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp |
index 1431d436f391e4645abe6c010025873a222d0a96..9090ff274fa8e137b21ff928a4141a2274a5f0d6 100644 |
--- a/lib/CodeGen/CodeGenModule.cpp |
+++ b/lib/CodeGen/CodeGenModule.cpp |
@@ -62,7 +62,6 @@ static CGCXXABI *createCXXABI(CodeGenModule &CGM) { |
switch (CGM.getTarget().getCXXABI().getKind()) { |
case TargetCXXABI::GenericAArch64: |
case TargetCXXABI::GenericARM: |
- case TargetCXXABI::Emscripten: // @LOCALMOD Emscripten |
case TargetCXXABI::iOS: |
case TargetCXXABI::iOS64: |
case TargetCXXABI::GenericMIPS: |
@@ -794,14 +793,6 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D, |
unsigned alignment = D->getMaxAlignment() / Context.getCharWidth(); |
if (alignment) |
F->setAlignment(alignment); |
- |
- // @LOCALMOD-START Emscripten |
- if (getTarget().getCXXABI().arePointersToMemberFunctionsAligned()) { |
- // C++ ABI requires 2-byte alignment for member functions. |
- if (F->getAlignment() < 2 && isa<CXXMethodDecl>(D)) |
- F->setAlignment(2); |
- } |
- // @LOCALMOD-END Emscripten |
} |
void CodeGenModule::SetCommonAttributes(const Decl *D, |