Skip to content

Commit 2018f4c

Browse files
committed
Reapply "[SandboxIR][NFC] Delete SandboxIR.h (#110309)"
This reverts commit 8dfeb4e.
1 parent f11775f commit 2018f4c

File tree

19 files changed

+36
-212
lines changed

19 files changed

+36
-212
lines changed

llvm/include/llvm/SandboxIR/Constant.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "llvm/IR/GlobalValue.h"
1919
#include "llvm/IR/GlobalVariable.h"
2020
#include "llvm/SandboxIR/Argument.h"
21+
#include "llvm/SandboxIR/BasicBlock.h"
2122
#include "llvm/SandboxIR/Context.h"
2223
#include "llvm/SandboxIR/Type.h"
2324
#include "llvm/SandboxIR/User.h"

llvm/include/llvm/SandboxIR/SandboxIR.h

Lines changed: 0 additions & 198 deletions
This file was deleted.

llvm/include/llvm/SandboxIR/Type.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class IntegerType;
3131
class FunctionType;
3232
class ArrayType;
3333
class StructType;
34+
class TargetExtType;
3435
class Module;
3536
#define DEF_INSTR(ID, OPCODE, CLASS) class CLASS;
3637
#define DEF_CONST(ID, CLASS) class CLASS;

llvm/include/llvm/SandboxIR/Value.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ namespace llvm::sandboxir {
2222
class Context;
2323
class FuncletPadInst;
2424
class Type;
25+
class GlobalValue;
26+
class GlobalObject;
27+
class Module;
28+
class UnaryInstruction;
2529

2630
/// Iterator for the `Use` edges of a Value's users.
2731
/// \Returns a `Use` when dereferenced.

llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef LLVM_TRANSFORMS_VECTORIZE_SANDBOXVECTORIZER_INSTRINTERVAL_H
2121
#define LLVM_TRANSFORMS_VECTORIZE_SANDBOXVECTORIZER_INSTRINTERVAL_H
2222

23-
#include "llvm/SandboxIR/SandboxIR.h"
23+
#include "llvm/ADT/ArrayRef.h"
2424
#include <iterator>
2525

2626
namespace llvm::sandboxir {

llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/Legality.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
#ifndef LLVM_TRANSFORMS_VECTORIZE_SANDBOXVECTORIZER_LEGALITY_H
1313
#define LLVM_TRANSFORMS_VECTORIZE_SANDBOXVECTORIZER_LEGALITY_H
1414

15-
#include "llvm/SandboxIR/SandboxIR.h"
15+
#include "llvm/ADT/ArrayRef.h"
1616

1717
namespace llvm::sandboxir {
1818

1919
class LegalityAnalysis;
20+
class Value;
2021

2122
enum class LegalityResultID {
2223
Widen, ///> Vectorize by combining scalars to a vector.

llvm/lib/SandboxIR/Module.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/SandboxIR/Module.h"
10-
#include "llvm/SandboxIR/SandboxIR.h"
10+
#include "llvm/SandboxIR/Constant.h"
11+
#include "llvm/SandboxIR/Context.h"
12+
#include "llvm/SandboxIR/Value.h"
1113

1214
using namespace llvm::sandboxir;
1315

llvm/lib/SandboxIR/PassManager.cpp

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

99
#include "llvm/SandboxIR/PassManager.h"
10-
#include "llvm/SandboxIR/SandboxIR.h"
1110

1211
using namespace llvm::sandboxir;
1312

llvm/lib/SandboxIR/SandboxIR.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "llvm/SandboxIR/SandboxIR.h"
109
#include "llvm/ADT/SmallPtrSet.h"
1110
#include "llvm/ADT/SmallVector.h"
1211
#include "llvm/IR/Constants.h"
1312
#include "llvm/SandboxIR/Argument.h"
1413
#include "llvm/SandboxIR/BasicBlock.h"
14+
#include "llvm/SandboxIR/Context.h"
15+
#include "llvm/SandboxIR/User.h"
1516
#include "llvm/Support/Debug.h"
1617
#include <sstream>
1718

llvm/lib/SandboxIR/Type.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/SandboxIR/Type.h"
10-
#include "llvm/SandboxIR/SandboxIR.h"
10+
#include "llvm/SandboxIR/Context.h"
1111

1212
using namespace llvm::sandboxir;
1313

llvm/lib/SandboxIR/Value.cpp

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

99
#include "llvm/SandboxIR/Value.h"
1010
#include "llvm/SandboxIR/Context.h"
11-
#include "llvm/SandboxIR/SandboxIR.h"
11+
#include "llvm/SandboxIR/User.h"
1212
#include <sstream>
1313

1414
namespace llvm::sandboxir {

llvm/lib/Transforms/Vectorize/SandboxVectorizer/SandboxVectorizer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
#include "llvm/Transforms/Vectorize/SandboxVectorizer/SandboxVectorizer.h"
1010
#include "llvm/Analysis/TargetTransformInfo.h"
11+
#include "llvm/SandboxIR/Constant.h"
1112
#include "llvm/SandboxIR/PassManager.h"
12-
#include "llvm/SandboxIR/SandboxIR.h"
1313
#include "llvm/Support/CommandLine.h"
1414
#include "llvm/Transforms/Vectorize/SandboxVectorizer/Passes/BottomUpVec.h"
1515

llvm/unittests/SandboxIR/PassTest.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
#include "llvm/SandboxIR/Pass.h"
1010
#include "llvm/AsmParser/Parser.h"
1111
#include "llvm/IR/Module.h"
12+
#include "llvm/SandboxIR/Constant.h"
13+
#include "llvm/SandboxIR/Context.h"
1214
#include "llvm/SandboxIR/PassManager.h"
13-
#include "llvm/SandboxIR/SandboxIR.h"
1415
#include "llvm/Support/SourceMgr.h"
1516
#include "gtest/gtest.h"
1617

llvm/unittests/SandboxIR/RegionTest.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
#include "llvm/SandboxIR/Region.h"
1010
#include "llvm/AsmParser/Parser.h"
11-
#include "llvm/SandboxIR/SandboxIR.h"
11+
#include "llvm/SandboxIR/Constant.h"
12+
#include "llvm/SandboxIR/Context.h"
13+
#include "llvm/SandboxIR/Instruction.h"
1214
#include "llvm/Support/SourceMgr.h"
1315
#include "gmock/gmock-matchers.h"
1416
#include "gtest/gtest.h"

llvm/unittests/SandboxIR/SandboxIRTest.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,19 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "llvm/SandboxIR/SandboxIR.h"
109
#include "llvm/AsmParser/Parser.h"
1110
#include "llvm/IR/BasicBlock.h"
1211
#include "llvm/IR/Constants.h"
1312
#include "llvm/IR/DataLayout.h"
1413
#include "llvm/IR/Function.h"
1514
#include "llvm/IR/Instruction.h"
1615
#include "llvm/IR/Module.h"
16+
#include "llvm/SandboxIR/BasicBlock.h"
17+
#include "llvm/SandboxIR/Constant.h"
18+
#include "llvm/SandboxIR/Instruction.h"
19+
#include "llvm/SandboxIR/Module.h"
1720
#include "llvm/SandboxIR/Utils.h"
21+
#include "llvm/SandboxIR/Value.h"
1822
#include "llvm/Support/SourceMgr.h"
1923
#include "gmock/gmock-matchers.h"
2024
#include "gtest/gtest.h"

llvm/unittests/SandboxIR/TypesTest.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
#include "llvm/IR/Function.h"
1515
#include "llvm/IR/Instruction.h"
1616
#include "llvm/IR/Module.h"
17-
#include "llvm/SandboxIR/SandboxIR.h"
17+
#include "llvm/SandboxIR/Constant.h"
18+
#include "llvm/SandboxIR/Context.h"
1819
#include "llvm/Support/SourceMgr.h"
1920
#include "gtest/gtest.h"
2021

llvm/unittests/SandboxIR/UtilsTest.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
#include "llvm/IR/Function.h"
1414
#include "llvm/IR/Instruction.h"
1515
#include "llvm/IR/Module.h"
16-
#include "llvm/SandboxIR/SandboxIR.h"
16+
#include "llvm/SandboxIR/Constant.h"
17+
#include "llvm/SandboxIR/Context.h"
1718
#include "llvm/Support/SourceMgr.h"
1819
#include "gtest/gtest.h"
1920

llvm/unittests/Transforms/Vectorize/SandboxVectorizer/DependencyGraphTest.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
#include "llvm/Transforms/Vectorize/SandboxVectorizer/DependencyGraph.h"
1010
#include "llvm/AsmParser/Parser.h"
11-
#include "llvm/SandboxIR/SandboxIR.h"
11+
#include "llvm/SandboxIR/Constant.h"
12+
#include "llvm/SandboxIR/Context.h"
13+
#include "llvm/SandboxIR/Instruction.h"
1214
#include "llvm/Support/SourceMgr.h"
1315
#include "gmock/gmock-matchers.h"
1416
#include "gtest/gtest.h"

llvm/unittests/Transforms/Vectorize/SandboxVectorizer/IntervalTest.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#include "llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h"
1010
#include "llvm/AsmParser/Parser.h"
11+
#include "llvm/SandboxIR/Constant.h"
12+
#include "llvm/SandboxIR/Context.h"
1113
#include "llvm/SandboxIR/Instruction.h"
1214
#include "llvm/Support/SourceMgr.h"
1315
#include "gtest/gtest.h"

0 commit comments

Comments
 (0)