diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-15 14:03:16 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-15 14:03:16 -0700 |
| commit | 9a2ec7c6ed3eb1b133257f5f40503034fcde40de (patch) | |
| tree | 06f6f2e29330c940059a4df7193b905a01c3b7bf /lib/Target/CppBackend/CPPBackend.cpp | |
| parent | 0ecc9098929275a2b6672d625106225231bed813 (diff) | |
| parent | bb20b24224734f5369d124181d086703ca439dd7 (diff) | |
Merge commit 'bb20b24224734f5369d124181d086703ca439dd7'
Conflicts:
lib/Target/X86/X86FrameLowering.cpp
lib/Target/X86/X86ISelLowering.cpp
Diffstat (limited to 'lib/Target/CppBackend/CPPBackend.cpp')
| -rw-r--r-- | lib/Target/CppBackend/CPPBackend.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/Target/CppBackend/CPPBackend.cpp b/lib/Target/CppBackend/CPPBackend.cpp index 096e2bc13b..5b17a0f927 100644 --- a/lib/Target/CppBackend/CPPBackend.cpp +++ b/lib/Target/CppBackend/CPPBackend.cpp @@ -509,9 +509,7 @@ void CppWriter::printAttributes(const AttrListPtr &PAL, HANDLE_ATTR(NonLazyBind); #undef HANDLE_ATTR if (attrs.hasAttribute(Attributes::StackAlignment)) - Out << "B.addStackAlignmentAttr(Attribute::constructStackAlignmentFromInt(" - << attrs.getStackAlignment() - << "))"; + Out << "B.addStackAlignmentAttr(" << attrs.getStackAlignment() << ")"; nl(Out); attrs.removeAttribute(Attributes::StackAlignment); assert(!attrs.hasAttributes() && "Unhandled attribute!"); |