Skip to content

Commit 16206ee

Browse files
committedApr 10, 2020
[WebAssembly] Minor cleanup to WebAssemblySubtarget. NFC.
Pretty much all other platforms pass CPU string as arg0 of initializeSubtargetDependencies. Differential Revision: https://reviews.llvm.org/D77894
1 parent 7ba045a commit 16206ee

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed
 

‎llvm/lib/Target/WebAssembly/WebAssemblySubtarget.cpp

+9-8
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,25 @@ using namespace llvm;
2525
#include "WebAssemblyGenSubtargetInfo.inc"
2626

2727
WebAssemblySubtarget &
28-
WebAssemblySubtarget::initializeSubtargetDependencies(StringRef FS) {
28+
WebAssemblySubtarget::initializeSubtargetDependencies(StringRef CPU,
29+
StringRef FS) {
2930
// Determine default and user-specified characteristics
31+
LLVM_DEBUG(llvm::dbgs() << "initializeSubtargetDependencies\n");
3032

31-
if (CPUString.empty())
32-
CPUString = "generic";
33+
if (CPU.empty())
34+
CPU = "generic";
3335

34-
ParseSubtargetFeatures(CPUString, FS);
36+
ParseSubtargetFeatures(CPU, FS);
3537
return *this;
3638
}
3739

3840
WebAssemblySubtarget::WebAssemblySubtarget(const Triple &TT,
3941
const std::string &CPU,
4042
const std::string &FS,
4143
const TargetMachine &TM)
42-
: WebAssemblyGenSubtargetInfo(TT, CPU, FS), CPUString(CPU),
43-
TargetTriple(TT), FrameLowering(),
44-
InstrInfo(initializeSubtargetDependencies(FS)), TSInfo(),
45-
TLInfo(TM, *this) {}
44+
: WebAssemblyGenSubtargetInfo(TT, CPU, FS), TargetTriple(TT),
45+
FrameLowering(), InstrInfo(initializeSubtargetDependencies(CPU, FS)),
46+
TSInfo(), TLInfo(TM, *this) {}
4647

4748
bool WebAssemblySubtarget::enableAtomicExpand() const {
4849
// If atomics are disabled, atomic ops are lowered instead of expanded

‎llvm/lib/Target/WebAssembly/WebAssemblySubtarget.h

+2-6
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ class WebAssemblySubtarget final : public WebAssemblyGenSubtargetInfo {
4949
bool HasTailCall = false;
5050
bool HasReferenceTypes = false;
5151

52-
/// String name of used CPU.
53-
std::string CPUString;
54-
5552
/// What processor and OS we're targeting.
5653
Triple TargetTriple;
5754

@@ -60,9 +57,8 @@ class WebAssemblySubtarget final : public WebAssemblyGenSubtargetInfo {
6057
WebAssemblySelectionDAGInfo TSInfo;
6158
WebAssemblyTargetLowering TLInfo;
6259

63-
/// Initializes using CPUString and the passed in feature string so that we
64-
/// can use initializer lists for subtarget initialization.
65-
WebAssemblySubtarget &initializeSubtargetDependencies(StringRef FS);
60+
WebAssemblySubtarget &initializeSubtargetDependencies(StringRef CPU,
61+
StringRef FS);
6662

6763
public:
6864
/// This constructor initializes the data members to match that

0 commit comments

Comments
 (0)
Please sign in to comment.