Skip to content

Commit 57bd898

Browse files
SC llvm teamSC llvm team
SC llvm team
authored and
SC llvm team
committed
Merged main:747e0d9f0aad into amd-gfx:fdf184dabd64
Local branch amd-gfx fdf184d Merged main:a9136f0ad94b into amd-gfx:029a46b97375 Remote branch main 747e0d9 [compiler-rt] Use std::clamp (NFC)
2 parents fdf184d + 747e0d9 commit 57bd898

File tree

15 files changed

+23
-19
lines changed

15 files changed

+23
-19
lines changed

‎compiler-rt/lib/fuzzer/FuzzerLoop.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ void Fuzzer::ReadAndExecuteSeedCorpora(std::vector<SizedFile> &CorporaFiles) {
799799
TotalSize += File.Size;
800800
}
801801
if (Options.MaxLen == 0)
802-
SetMaxInputLen(std::min(std::max(kMinDefaultLen, MaxSize), kMaxSaneLen));
802+
SetMaxInputLen(std::clamp(MaxSize, kMinDefaultLen, kMaxSaneLen));
803803
assert(MaxInputLen > 0);
804804

805805
// Test the callback with empty input and never try it again.

‎lldb/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
using namespace lldb_private;
2525
using namespace lldb_private::python;
26-
using llvm::Error;
2726
using llvm::Expected;
2827

2928
class PythonDataObjectsTest : public PythonTestSuite {

‎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 478289
19+
#define LLVM_MAIN_REVISION 478294
2020

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

‎llvm/lib/Analysis/LoopAccessAnalysis.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "llvm/Analysis/LoopAccessAnalysis.h"
1515
#include "llvm/ADT/APInt.h"
1616
#include "llvm/ADT/DenseMap.h"
17-
#include "llvm/ADT/DepthFirstIterator.h"
1817
#include "llvm/ADT/EquivalenceClasses.h"
1918
#include "llvm/ADT/PointerIntPair.h"
2019
#include "llvm/ADT/STLExtras.h"

‎llvm/lib/Analysis/RegionPrinter.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
//===----------------------------------------------------------------------===//
1010

1111
#include "llvm/Analysis/RegionPrinter.h"
12-
#include "llvm/ADT/DepthFirstIterator.h"
1312
#include "llvm/Analysis/DOTGraphTraitsPass.h"
1413
#include "llvm/Analysis/RegionInfo.h"
1514
#include "llvm/Analysis/RegionIterator.h"

‎llvm/lib/CodeGen/PrologEpilogInserter.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,9 @@ bool PEI::runOnMachineFunction(MachineFunction &MF) {
337337
return MachineOptimizationRemarkAnalysis(DEBUG_TYPE, "StackSize",
338338
MF.getFunction().getSubprogram(),
339339
&MF.front())
340-
<< ore::NV("NumStackBytes", StackSize) << " stack bytes in function";
340+
<< ore::NV("NumStackBytes", StackSize)
341+
<< " stack bytes in function '"
342+
<< ore::NV("Function", MF.getFunction().getName()) << "'";
341343
});
342344

343345
delete RS;

‎llvm/lib/Target/AArch64/AArch64StackTagging.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "AArch64Subtarget.h"
1313
#include "AArch64TargetMachine.h"
1414
#include "llvm/ADT/DenseMap.h"
15-
#include "llvm/ADT/DepthFirstIterator.h"
1615
#include "llvm/ADT/MapVector.h"
1716
#include "llvm/ADT/SmallVector.h"
1817
#include "llvm/ADT/Statistic.h"

‎llvm/lib/Target/AArch64/AArch64StackTaggingPreRA.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "AArch64.h"
1111
#include "AArch64MachineFunctionInfo.h"
1212
#include "AArch64InstrInfo.h"
13-
#include "llvm/ADT/DepthFirstIterator.h"
1413
#include "llvm/ADT/SetVector.h"
1514
#include "llvm/ADT/Statistic.h"
1615
#include "llvm/CodeGen/MachineBranchProbabilityInfo.h"

‎llvm/lib/Target/AMDGPU/GCNCreateVOPD.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "Utils/AMDGPUBaseInfo.h"
2626
#include "llvm/ADT/SmallVector.h"
2727
#include "llvm/ADT/Statistic.h"
28-
#include "llvm/ADT/StringMap.h"
2928
#include "llvm/CodeGen/MachineBasicBlock.h"
3029
#include "llvm/CodeGen/MachineInstr.h"
3130
#include "llvm/CodeGen/MachineOperand.h"

‎llvm/lib/Target/NVPTX/NVVMReflect.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
#include "NVPTX.h"
2222
#include "llvm/ADT/SmallVector.h"
23-
#include "llvm/ADT/StringMap.h"
2423
#include "llvm/IR/Constants.h"
2524
#include "llvm/IR/DerivedTypes.h"
2625
#include "llvm/IR/Function.h"

‎llvm/lib/Target/X86/X86FastPreTileConfig.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "X86MachineFunctionInfo.h"
2121
#include "X86RegisterInfo.h"
2222
#include "X86Subtarget.h"
23-
#include "llvm/ADT/DepthFirstIterator.h"
2423
#include "llvm/ADT/PostOrderIterator.h"
2524
#include "llvm/ADT/Statistic.h"
2625
#include "llvm/CodeGen/MachineFrameInfo.h"

‎llvm/lib/Transforms/IPO/SampleContextTracker.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "llvm/Transforms/IPO/SampleContextTracker.h"
14-
#include "llvm/ADT/StringMap.h"
1514
#include "llvm/ADT/StringRef.h"
1615
#include "llvm/IR/DebugInfoMetadata.h"
1716
#include "llvm/IR/InstrTypes.h"

‎llvm/lib/Transforms/Vectorize/VPlan.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "VPlan.h"
2020
#include "VPlanCFG.h"
2121
#include "VPlanDominatorTree.h"
22-
#include "llvm/ADT/DepthFirstIterator.h"
2322
#include "llvm/ADT/PostOrderIterator.h"
2423
#include "llvm/ADT/STLExtras.h"
2524
#include "llvm/ADT/SmallVector.h"

‎llvm/test/CodeGen/AArch64/prologue-epilogue-remarks.mir

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ stack:
1111
# CHECK: Function: fun0
1212
# CHECK-NEXT: Args:
1313
# CHECK-NEXT: - NumStackBytes: '16'
14-
# CHECK-NEXT: - String: ' stack bytes in function'
14+
# CHECK-NEXT: - String: ' stack bytes in function '''
15+
# CHECK-NEXT: - Function: fun0
16+
# CHECK-NEXT: - String: ''''
1517
# CHECK-NEXT: ...
1618
constants:
1719
body: |
@@ -29,7 +31,9 @@ stack:
2931
# CHECK: Function: fun1
3032
# CHECK-NEXT: Args:
3133
# CHECK-NEXT: - NumStackBytes: '32'
32-
# CHECK-NEXT: - String: ' stack bytes in function'
34+
# CHECK-NEXT: - String: ' stack bytes in function '''
35+
# CHECK-NEXT: - Function: fun1
36+
# CHECK-NEXT: - String: ''''
3337
# CHECK-NEXT: ...
3438
constants:
3539
body: |
@@ -47,7 +51,9 @@ stack:
4751
# CHECK: Function: fun2
4852
# CHECK-NEXT: Args:
4953
# CHECK-NEXT: - NumStackBytes: '1040'
50-
# CHECK-NEXT: - String: ' stack bytes in function'
54+
# CHECK-NEXT: - String: ' stack bytes in function '''
55+
# CHECK-NEXT: - Function: fun2
56+
# CHECK-NEXT: - String: ''''
5157
# CHECK-NEXT: ...
5258
constants:
5359
body: |

‎llvm/test/CodeGen/X86/prologue-epilogue-remarks.mir

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ stack:
1717
# CHECK-NEXT: Function: fun0
1818
# CHECK-NEXT: Args:
1919
# CHECK-NEXT: - NumStackBytes: '8'
20-
# CHECK-NEXT: - String: ' stack bytes in function'
20+
# CHECK-NEXT: - String: ' stack bytes in function '''
21+
# CHECK-NEXT: - Function: fun0
22+
# CHECK-NEXT: - String: ''''
2123
# CHECK-NEXT: ...
2224

2325
constants:
@@ -36,7 +38,9 @@ stack:
3638
# CHECK-NEXT: Function: fun1
3739
# CHECK-NEXT: Args:
3840
# CHECK-NEXT: - NumStackBytes: '20'
39-
# CHECK-NEXT: - String: ' stack bytes in function'
41+
# CHECK-NEXT: - String: ' stack bytes in function '''
42+
# CHECK-NEXT: - Function: fun1
43+
# CHECK-NEXT: - String: ''''
4044
# CHECK-NEXT: ...
4145
constants:
4246
body: |
@@ -54,7 +58,9 @@ stack:
5458
# CHECK-NEXT: Function: fun2
5559
# CHECK-NEXT: Args:
5660
# CHECK-NEXT: - NumStackBytes: '1024'
57-
# CHECK-NEXT: - String: ' stack bytes in function'
61+
# CHECK-NEXT: - String: ' stack bytes in function '''
62+
# CHECK-NEXT: - Function: fun2
63+
# CHECK-NEXT: - String: ''''
5864
# CHECK-NEXT: ...
5965
constants:
6066
body: |

0 commit comments

Comments
 (0)