This is an archive of the discontinued LLVM Phabricator instance.

Differential D74974

[XCOFF][AIX] Fix incorrect alignment for function descriptor csect
ClosedPublic

Authored by jasonliu on Feb 21 2020, 10:18 AM.

Details

Reviewers
daltenty
DiggerLin
hubert.reinterpretcast
Xiangling_L
Commits
rGbee70bfff0f4: [XCOFF][AIX] Fix incorrect alignment for function descriptor csect
Summary

Function descriptor csect on AIX should be 4 byte align instead of 1 byte align.

Diff Detail

Event Timeline

jasonliu created this revision.Feb 21 2020, 10:18 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 21 2020, 10:18 AM
Herald added subscribers: llvm-commits, jsji, kbarton and 2 others. · View Herald Transcript
jasonliu added a reviewer: Xiangling_L.Feb 21 2020, 10:19 AM
Herald added a subscriber: • wuzish. · View Herald TranscriptFeb 21 2020, 10:19 AM
daltenty accepted this revision.Feb 21 2020, 10:58 AM

LGTM

This revision is now accepted and ready to land.Feb 21 2020, 10:58 AM
Closed by commit rGbee70bfff0f4: [XCOFF][AIX] Fix incorrect alignment for function descriptor csect (authored by jasonliu). · Explain WhyFeb 24 2020, 10:21 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
Target/
PowerPC/
3 lines
test/
CodeGen/
PowerPC/
2 lines
2 lines

Diff 246249

llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp

Show First 20 Lines • Show All 1,541 Lines • ▼ Show 20 Lines if (Subtarget->isPPC64()) {
OutStreamer->emitIntValue(0, 4/*size*/); OutStreamer->emitIntValue(0, 4/*size*/);
OutStreamer->emitIntValue(0, 8/*size*/); OutStreamer->emitIntValue(0, 8/*size*/);
} }
} }
void PPCAIXAsmPrinter::SetupMachineFunction(MachineFunction &MF) { void PPCAIXAsmPrinter::SetupMachineFunction(MachineFunction &MF) {
// Get the function descriptor symbol. // Get the function descriptor symbol.
CurrentFnDescSym = getSymbol(&MF.getFunction()); CurrentFnDescSym = getSymbol(&MF.getFunction());
// Set the containing csect. // Set the alignment and the containing csect.
MCSectionXCOFF *FnDescSec = cast<MCSectionXCOFF>( MCSectionXCOFF *FnDescSec = cast<MCSectionXCOFF>(
getObjFileLowering().getSectionForFunctionDescriptor(CurrentFnDescSym)); getObjFileLowering().getSectionForFunctionDescriptor(CurrentFnDescSym));
FnDescSec->setAlignment(Align(Subtarget->isPPC64() ? 8 : 4));
cast<MCSymbolXCOFF>(CurrentFnDescSym)->setContainingCsect(FnDescSec); cast<MCSymbolXCOFF>(CurrentFnDescSym)->setContainingCsect(FnDescSec);
return AsmPrinter::SetupMachineFunction(MF); return AsmPrinter::SetupMachineFunction(MF);
} }
void PPCAIXAsmPrinter::ValidateGV(const GlobalVariable *GV) { void PPCAIXAsmPrinter::ValidateGV(const GlobalVariable *GV) {
// Early error checking limiting what is supported. // Early error checking limiting what is supported.
if (GV->isThreadLocal()) if (GV->isThreadLocal())
▲ Show 20 Lines • Show All 209 Lines • Show Last 20 Lines

llvm/test/CodeGen/PowerPC/aix-func-dsc-gen.ll

Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Lines
; CHECK-NEXT: Type: 0x0 ; CHECK-NEXT: Type: 0x0
; CHECK-NEXT: StorageClass: C_HIDEXT (0x6B) ; CHECK-NEXT: StorageClass: C_HIDEXT (0x6B)
; CHECK-NEXT: NumberOfAuxEntries: 1 ; CHECK-NEXT: NumberOfAuxEntries: 1
; CHECK-NEXT: CSECT Auxiliary Entry { ; CHECK-NEXT: CSECT Auxiliary Entry {
; CHECK-NEXT: Index: [[#Index+5]] ; CHECK-NEXT: Index: [[#Index+5]]
; CHECK-NEXT: SectionLen: 12 ; CHECK-NEXT: SectionLen: 12
; CHECK-NEXT: ParameterHashIndex: 0x0 ; CHECK-NEXT: ParameterHashIndex: 0x0
; CHECK-NEXT: TypeChkSectNum: 0x0 ; CHECK-NEXT: TypeChkSectNum: 0x0
; CHECK-NEXT: SymbolAlignmentLog2: 0 ; CHECK-NEXT: SymbolAlignmentLog2: 2
; CHECK-NEXT: SymbolType: XTY_SD (0x1) ; CHECK-NEXT: SymbolType: XTY_SD (0x1)
; CHECK-NEXT: StorageMappingClass: XMC_DS (0xA) ; CHECK-NEXT: StorageMappingClass: XMC_DS (0xA)
; CHECK-NEXT: StabInfoIndex: 0x0 ; CHECK-NEXT: StabInfoIndex: 0x0
; CHECK-NEXT: StabSectNum: 0x0 ; CHECK-NEXT: StabSectNum: 0x0
; CHECK-NEXT: } ; CHECK-NEXT: }
; CHECK-NEXT: } ; CHECK-NEXT: }
; CHECK-NEXT: Symbol { ; CHECK-NEXT: Symbol {
; CHECK-NEXT: Index: [[#Index+6]] ; CHECK-NEXT: Index: [[#Index+6]]
Show All 38 Lines

llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll

Show First 20 Lines • Show All 312 Lines • ▼ Show 20 Lines
; SYM-NEXT: Type: 0x0 ; SYM-NEXT: Type: 0x0
; SYM-NEXT: StorageClass: C_HIDEXT (0x6B) ; SYM-NEXT: StorageClass: C_HIDEXT (0x6B)
; SYM-NEXT: NumberOfAuxEntries: 1 ; SYM-NEXT: NumberOfAuxEntries: 1
; SYM-NEXT: CSECT Auxiliary Entry { ; SYM-NEXT: CSECT Auxiliary Entry {
; SYM-NEXT: Index: 17 ; SYM-NEXT: Index: 17
; SYM-NEXT: SectionLen: 12 ; SYM-NEXT: SectionLen: 12
; SYM-NEXT: ParameterHashIndex: 0x0 ; SYM-NEXT: ParameterHashIndex: 0x0
; SYM-NEXT: TypeChkSectNum: 0x0 ; SYM-NEXT: TypeChkSectNum: 0x0
; SYM-NEXT: SymbolAlignmentLog2: 0 ; SYM-NEXT: SymbolAlignmentLog2: 2
; SYM-NEXT: SymbolType: XTY_SD (0x1) ; SYM-NEXT: SymbolType: XTY_SD (0x1)
; SYM-NEXT: StorageMappingClass: XMC_DS (0xA) ; SYM-NEXT: StorageMappingClass: XMC_DS (0xA)
; SYM-NEXT: StabInfoIndex: 0x0 ; SYM-NEXT: StabInfoIndex: 0x0
; SYM-NEXT: StabSectNum: 0x0 ; SYM-NEXT: StabSectNum: 0x0
; SYM-NEXT: } ; SYM-NEXT: }
; SYM-NEXT: } ; SYM-NEXT: }
; SYM-NEXT: Symbol { ; SYM-NEXT: Symbol {
; SYM-NEXT: Index: 18 ; SYM-NEXT: Index: 18
▲ Show 20 Lines • Show All 119 Lines • Show Last 20 Lines