ca3d248c27
Backed out changeset 10e2414392ae (bug 1758780) Backed out changeset 481062597411 (bug 1758780)
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
diff --git a/clang/include/clang/Basic/TargetInfo.h b/clang/include/clang/Basic/TargetInfo.h
|
|
index 4f0cbf986b31..e129481fc0e4 100644
|
|
--- a/clang/include/clang/Basic/TargetInfo.h
|
|
+++ b/clang/include/clang/Basic/TargetInfo.h
|
|
@@ -618,8 +618,8 @@ public:
|
|
}
|
|
|
|
/// Return the largest alignment for which a suitably-sized allocation with
|
|
- /// '::operator new(size_t)' or 'malloc' is guaranteed to produce a
|
|
- /// correctly-aligned pointer.
|
|
+ /// '::operator new(size_t)' is guaranteed to produce a correctly-aligned
|
|
+ /// pointer.
|
|
unsigned getNewAlign() const {
|
|
return NewAlign ? NewAlign : std::max(LongDoubleAlign, LongLongAlign);
|
|
}
|
|
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
|
|
index 47a4ed35be85..f77db7bdcecf 100644
|
|
--- a/clang/lib/CodeGen/CGCall.cpp
|
|
+++ b/clang/lib/CodeGen/CGCall.cpp
|
|
@@ -2052,24 +2052,6 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
|
|
// allows it to work on indirect virtual function calls.
|
|
if (AttrOnCallSite && TargetDecl->hasAttr<NoMergeAttr>())
|
|
FuncAttrs.addAttribute(llvm::Attribute::NoMerge);
|
|
-
|
|
- // Add known guaranteed alignment for allocation functions.
|
|
- if (unsigned BuiltinID = Fn->getBuiltinID()) {
|
|
- switch (BuiltinID) {
|
|
- case Builtin::BIaligned_alloc:
|
|
- case Builtin::BIcalloc:
|
|
- case Builtin::BImalloc:
|
|
- case Builtin::BImemalign:
|
|
- case Builtin::BIrealloc:
|
|
- case Builtin::BIstrdup:
|
|
- case Builtin::BIstrndup:
|
|
- RetAttrs.addAlignmentAttr(Context.getTargetInfo().getNewAlign() /
|
|
- Context.getTargetInfo().getCharWidth());
|
|
- break;
|
|
- default:
|
|
- break;
|
|
- }
|
|
- }
|
|
}
|
|
|
|
// 'const', 'pure' and 'noalias' attributed functions are also nounwind.
|