Skip to content

Commit 9e85937

Browse files
authored
[SandboxIR][NFC] Rename SandboxIRValues.def to Values.def (#110538)
1 parent 8ab50da commit 9e85937

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

llvm/include/llvm/SandboxIR/Constant.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class Constant : public sandboxir::User {
4646
static bool classof(const sandboxir::Value *From) {
4747
switch (From->getSubclassID()) {
4848
#define DEF_CONST(ID, CLASS) case ClassID::ID:
49-
#include "llvm/SandboxIR/SandboxIRValues.def"
49+
#include "llvm/SandboxIR/Values.def"
5050
return true;
5151
default:
5252
return false;

llvm/include/llvm/SandboxIR/Context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class Context {
7171

7272
// Friends for getOrCreateConstant().
7373
#define DEF_CONST(ID, CLASS) friend class CLASS;
74-
#include "llvm/SandboxIR/SandboxIRValues.def"
74+
#include "llvm/SandboxIR/Values.def"
7575

7676
/// Create a sandboxir::BasicBlock for an existing LLVM IR \p BB. This will
7777
/// also create all contents of the block.

llvm/include/llvm/SandboxIR/Instruction.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Instruction : public User {
2626
#define OP(OPC) OPC,
2727
#define OPCODES(...) __VA_ARGS__
2828
#define DEF_INSTR(ID, OPC, CLASS) OPC
29-
#include "llvm/SandboxIR/SandboxIRValues.def"
29+
#include "llvm/SandboxIR/Values.def"
3030
};
3131

3232
protected:
@@ -365,7 +365,7 @@ template <typename LLVMT> class SingleLLVMInstructionImpl : public Instruction {
365365

366366
// All instructions are friends with this so they can call the constructor.
367367
#define DEF_INSTR(ID, OPC, CLASS) friend class CLASS;
368-
#include "llvm/SandboxIR/SandboxIRValues.def"
368+
#include "llvm/SandboxIR/Values.def"
369369
friend class UnaryInstruction;
370370
friend class CallBase;
371371
friend class FuncletPadInst;

llvm/include/llvm/SandboxIR/Type.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class TargetExtType;
3535
class Module;
3636
#define DEF_INSTR(ID, OPCODE, CLASS) class CLASS;
3737
#define DEF_CONST(ID, CLASS) class CLASS;
38-
#include "llvm/SandboxIR/SandboxIRValues.def"
38+
#include "llvm/SandboxIR/Values.def"
3939

4040
/// Just like llvm::Type these are immutable, unique, never get freed and can
4141
/// only be created via static factory methods.
@@ -65,7 +65,7 @@ class Type {
6565
// Friend all instruction classes because `create()` functions use LLVMTy.
6666
#define DEF_INSTR(ID, OPCODE, CLASS) friend class CLASS;
6767
#define DEF_CONST(ID, CLASS) friend class CLASS;
68-
#include "llvm/SandboxIR/SandboxIRValues.def"
68+
#include "llvm/SandboxIR/Values.def"
6969
Context &Ctx;
7070

7171
Type(llvm::Type *LLVMTy, Context &Ctx) : LLVMTy(LLVMTy), Ctx(Ctx) {}

llvm/include/llvm/SandboxIR/User.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class OperandUseIterator {
2626
OperandUseIterator(const class Use &Use) : Use(Use) {}
2727
friend class User; // For constructor
2828
#define DEF_INSTR(ID, OPC, CLASS) friend class CLASS; // For constructor
29-
#include "llvm/SandboxIR/SandboxIRValues.def"
29+
#include "llvm/SandboxIR/Values.def"
3030

3131
public:
3232
using difference_type = std::ptrdiff_t;

llvm/include/llvm/SandboxIR/Value.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace llvm::sandboxir {
1818
#define DEF_INSTR(ID, OPC, CLASS) class CLASS;
1919
#define DEF_CONST(ID, CLASS) class CLASS;
2020
#define DEF_USER(ID, CLASS) class CLASS;
21-
#include "llvm/SandboxIR/SandboxIRValues.def"
21+
#include "llvm/SandboxIR/Values.def"
2222
class Context;
2323
class FuncletPadInst;
2424
class Type;
@@ -63,7 +63,7 @@ class Value {
6363
#define DEF_USER(ID, CLASS) ID,
6464
#define DEF_CONST(ID, CLASS) ID,
6565
#define DEF_INSTR(ID, OPC, CLASS) ID,
66-
#include "llvm/SandboxIR/SandboxIRValues.def"
66+
#include "llvm/SandboxIR/Values.def"
6767
};
6868

6969
protected:
@@ -81,7 +81,7 @@ class Value {
8181
#define DEF_INSTR(ID, OPC, CLASS) \
8282
case ClassID::ID: \
8383
return #ID;
84-
#include "llvm/SandboxIR/SandboxIRValues.def"
84+
#include "llvm/SandboxIR/Values.def"
8585
}
8686
llvm_unreachable("Unimplemented ID");
8787
}

llvm/include/llvm/SandboxIR/SandboxIRValues.def renamed to llvm/include/llvm/SandboxIR/Values.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===- SandboxIRValues.def --------------------------------------*- C++ -*-===//
1+
//===- Values.def -----------------------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

llvm/lib/SandboxIR/Instruction.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const char *Instruction::getOpcodeName(Opcode Opc) {
1818
return #OPC;
1919
#define OPCODES(...) __VA_ARGS__
2020
#define DEF_INSTR(ID, OPC, CLASS) OPC
21-
#include "llvm/SandboxIR/SandboxIRValues.def"
21+
#include "llvm/SandboxIR/Values.def"
2222
}
2323
llvm_unreachable("Unknown Opcode");
2424
}
@@ -173,7 +173,7 @@ bool Instruction::classof(const sandboxir::Value *From) {
173173
#define DEF_INSTR(ID, OPC, CLASS) \
174174
case ClassID::ID: \
175175
return true;
176-
#include "llvm/SandboxIR/SandboxIRValues.def"
176+
#include "llvm/SandboxIR/Values.def"
177177
default:
178178
return false;
179179
}

llvm/lib/SandboxIR/User.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ bool User::classof(const Value *From) {
8282
#define DEF_INSTR(ID, OPC, CLASS) \
8383
case ClassID::ID: \
8484
return true;
85-
#include "llvm/SandboxIR/SandboxIRValues.def"
85+
#include "llvm/SandboxIR/Values.def"
8686
default:
8787
return false;
8888
}

llvm/unittests/SandboxIR/SandboxIRTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6114,5 +6114,5 @@ define void @foo() {
61146114
TEST_F(SandboxIRTest, CheckClassof) {
61156115
#define DEF_INSTR(ID, OPC, CLASS) \
61166116
EXPECT_NE(&sandboxir::CLASS::classof, &sandboxir::Instruction::classof);
6117-
#include "llvm/SandboxIR/SandboxIRValues.def"
6117+
#include "llvm/SandboxIR/Values.def"
61186118
}

0 commit comments

Comments
 (0)