Skip to content

Commit b6266ca

Browse files
SC llvm teamSC llvm team
authored andcommitted
Merged main:c30776ab9a14 into origin/amd-gfx:7e0640a99a92
Local branch origin/amd-gfx 7e0640a Merged main:c180e249d001 into origin/amd-gfx:2baeb40e888c Remote branch main c30776a [AArch64] Use ArrayRef::slice (NFC) (llvm#133862)
2 parents 7e0640a + c30776a commit b6266ca

File tree

672 files changed

+84137
-51970
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

672 files changed

+84137
-51970
lines changed

.github/workflows/libclang-abi-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- name: Install abi-compliance-checker
105105
run: |
106106
sudo apt-get update
107-
sudo apt-get install abi-dumper autoconf pkg-config
107+
sudo apt-get install -y abi-dumper autoconf pkg-config
108108
- name: Install universal-ctags
109109
run: |
110110
git clone https://github.com/universal-ctags/ctags.git
@@ -157,7 +157,7 @@ jobs:
157157
- name: Install abi-compliance-checker
158158
run: |
159159
sudo apt-get update
160-
sudo apt-get install abi-compliance-checker
160+
sudo apt-get install -y abi-compliance-checker
161161
- name: Compare ABI
162162
run: |
163163
for lib in ${{ needs.abi-dump-setup.outputs.ABI_LIBS }}; do

.github/workflows/llvm-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
- name: Install abi-compliance-checker
9393
run: |
9494
sudo apt-get update
95-
sudo apt-get install abi-dumper autoconf pkg-config
95+
sudo apt-get -y install abi-dumper autoconf pkg-config
9696
- name: Install universal-ctags
9797
run: |
9898
git clone https://github.com/universal-ctags/ctags.git
@@ -166,7 +166,7 @@ jobs:
166166
- name: Install abi-compliance-checker
167167
run: |
168168
sudo apt-get update
169-
sudo apt-get install abi-compliance-checker
169+
sudo apt-get -y install abi-compliance-checker
170170
- name: Compare ABI
171171
run: |
172172
if [ -s symbol-list/llvm.symbols ]; then

bolt/include/bolt/Core/MCPlusBuilder.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,11 @@ class MCPlusBuilder {
12661266

12671267
/// Return MCSymbol extracted from the expression.
12681268
virtual const MCSymbol *getTargetSymbol(const MCExpr *Expr) const {
1269-
if (auto *SymbolRefExpr = dyn_cast<const MCSymbolRefExpr>(Expr))
1269+
if (auto *BinaryExpr = dyn_cast<const MCBinaryExpr>(Expr))
1270+
return getTargetSymbol(BinaryExpr->getLHS());
1271+
1272+
auto *SymbolRefExpr = dyn_cast<const MCSymbolRefExpr>(Expr);
1273+
if (SymbolRefExpr && SymbolRefExpr->getKind() == MCSymbolRefExpr::VK_None)
12701274
return &SymbolRefExpr->getSymbol();
12711275

12721276
return nullptr;

bolt/lib/Core/BinaryFunction.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,6 +1219,11 @@ void BinaryFunction::handleIndirectBranch(MCInst &Instruction, uint64_t Size,
12191219
case IndirectBranchType::UNKNOWN:
12201220
// Keep processing. We'll do more checks and fixes in
12211221
// postProcessIndirectBranches().
1222+
if (opts::Verbosity > 2) {
1223+
outs() << "BOLT-WARNING: failed to match indirect branch, "
1224+
<< getPrintName() << " at 0x" << Twine::utohexstr(Offset)
1225+
<< " offset\n";
1226+
}
12221227
UnknownIndirectBranchOffsets.emplace(Offset);
12231228
break;
12241229
}

bolt/lib/Target/AArch64/AArch64MCPlusBuilder.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -862,20 +862,12 @@ class AArch64MCPlusBuilder : public MCPlusBuilder {
862862
if (AArchExpr && AArchExpr->getSubExpr())
863863
return getTargetSymbol(AArchExpr->getSubExpr());
864864

865-
auto *BinExpr = dyn_cast<MCBinaryExpr>(Expr);
866-
if (BinExpr)
867-
return getTargetSymbol(BinExpr->getLHS());
868-
869-
auto *SymExpr = dyn_cast<MCSymbolRefExpr>(Expr);
870-
if (SymExpr && SymExpr->getKind() == MCSymbolRefExpr::VK_None)
871-
return &SymExpr->getSymbol();
872-
873-
return nullptr;
865+
return MCPlusBuilder::getTargetSymbol(Expr);
874866
}
875867

876868
const MCSymbol *getTargetSymbol(const MCInst &Inst,
877869
unsigned OpNum = 0) const override {
878-
if (!getSymbolRefOperandNum(Inst, OpNum))
870+
if (!OpNum && !getSymbolRefOperandNum(Inst, OpNum))
879871
return nullptr;
880872

881873
const MCOperand &Op = Inst.getOperand(OpNum);

bolt/lib/Target/RISCV/RISCVMCPlusBuilder.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -338,15 +338,7 @@ class RISCVMCPlusBuilder : public MCPlusBuilder {
338338
if (RISCVExpr && RISCVExpr->getSubExpr())
339339
return getTargetSymbol(RISCVExpr->getSubExpr());
340340

341-
auto *BinExpr = dyn_cast<MCBinaryExpr>(Expr);
342-
if (BinExpr)
343-
return getTargetSymbol(BinExpr->getLHS());
344-
345-
auto *SymExpr = dyn_cast<MCSymbolRefExpr>(Expr);
346-
if (SymExpr && SymExpr->getKind() == MCSymbolRefExpr::VK_None)
347-
return &SymExpr->getSymbol();
348-
349-
return nullptr;
341+
return MCPlusBuilder::getTargetSymbol(Expr);
350342
}
351343

352344
const MCSymbol *getTargetSymbol(const MCInst &Inst,

bolt/lib/Target/X86/X86MCPlusBuilder.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1796,11 +1796,7 @@ class X86MCPlusBuilder : public MCPlusBuilder {
17961796
if (!Op.isExpr())
17971797
return nullptr;
17981798

1799-
auto *SymExpr = dyn_cast<MCSymbolRefExpr>(Op.getExpr());
1800-
if (!SymExpr || SymExpr->getKind() != MCSymbolRefExpr::VK_None)
1801-
return nullptr;
1802-
1803-
return &SymExpr->getSymbol();
1799+
return MCPlusBuilder::getTargetSymbol(Op.getExpr());
18041800
}
18051801

18061802
bool analyzeBranch(InstructionIterator Begin, InstructionIterator End,

0 commit comments

Comments
 (0)