Skip to content

Commit bfb7a65

Browse files
SC llvm teamSC llvm team
authored andcommitted
Merged main:ba8a2ade84f4c1bfc531fe3673470377c038f31d into amd-gfx:de5d17eeaae8
Local branch amd-gfx de5d17e Merged main:577785c5ca78a9714584b5c99ec085f8aea0a5c0 into amd-gfx:b1da22f35a5a Remote branch main ba8a2ad [DXIL] Use consistent SmallVector parameters
2 parents de5d17e + ba8a2ad commit bfb7a65

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

llvm/include/llvm/Config/llvm-config.h.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/* Indicate that this is LLVM compiled from the amd-gfx branch. */
1818
#define LLVM_HAVE_BRANCH_AMD_GFX
19-
#define LLVM_MAIN_REVISION 499106
19+
#define LLVM_MAIN_REVISION 499109
2020

2121
/* Define if LLVM_ENABLE_DUMP is enabled */
2222
#cmakedefine LLVM_ENABLE_DUMP

llvm/lib/DWARFLinker/Parallel/OutputSections.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ struct SectionDescriptor : SectionDescriptorBase {
220220
/// Returns section content.
221221
StringRef getContents() override {
222222
if (SectionOffsetInsideAsmPrinterOutputStart == 0)
223-
return StringRef(Contents.data(), Contents.size());
223+
return Contents;
224224

225225
return Contents.slice(SectionOffsetInsideAsmPrinterOutputStart,
226226
SectionOffsetInsideAsmPrinterOutputEnd);

llvm/lib/Target/DirectX/DXILOpLowering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static bool isVectorArgExpansion(Function &F) {
4141
}
4242

4343
static SmallVector<Value *> populateOperands(Value *Arg, IRBuilder<> &Builder) {
44-
SmallVector<Value *, 4> ExtractedElements;
44+
SmallVector<Value *> ExtractedElements;
4545
auto *VecArg = dyn_cast<FixedVectorType>(Arg->getType());
4646
for (unsigned I = 0; I < VecArg->getNumElements(); ++I) {
4747
Value *Index = ConstantInt::get(Type::getInt32Ty(Arg->getContext()), I);

llvm/tools/dsymutil/MachODebugMapParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ void MachODebugMapParser::switchToNewLibDebugMapObject(
301301

302302
if (CurrentDebugMapObject &&
303303
CurrentDebugMapObject->getType() == MachO::N_LIB &&
304-
CurrentDebugMapObject->getObjectFilename().compare(Path.str()) == 0) {
304+
CurrentDebugMapObject->getObjectFilename() == Path) {
305305
return;
306306
}
307307

0 commit comments

Comments
 (0)