[WebAssembly] Update Config member to match command line option
Subscribers: dschuff, jgravelle-google, aheejin, sunfish, llvm-commits
Differential Revision: https://reviews.llvm.org/D50976
git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@343157 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/wasm/Config.h b/wasm/Config.h
index ae8989f..e100ab8 100644
--- a/wasm/Config.h
+++ b/wasm/Config.h
@@ -20,7 +20,7 @@
struct Configuration {
bool AllowUndefined;
- bool CompressRelocTargets;
+ bool CompressRelocations;
bool Demangle;
bool DisableVerify;
bool ExportAll;
diff --git a/wasm/Driver.cpp b/wasm/Driver.cpp
index 789bda9..8978558 100644
--- a/wasm/Driver.cpp
+++ b/wasm/Driver.cpp
@@ -396,7 +396,7 @@
Config->SearchPaths = args::getStrings(Args, OPT_L);
Config->StripAll = Args.hasArg(OPT_strip_all);
Config->StripDebug = Args.hasArg(OPT_strip_debug);
- Config->CompressRelocTargets = Args.hasArg(OPT_compress_relocations);
+ Config->CompressRelocations = Args.hasArg(OPT_compress_relocations);
Config->StackFirst = Args.hasArg(OPT_stack_first);
Config->ThinLTOCacheDir = Args.getLastArgValue(OPT_thinlto_cache_dir);
Config->ThinLTOCachePolicy = CHECK(
@@ -412,7 +412,7 @@
Config->ZStackSize =
args::getZOptionValue(Args, OPT_z, "stack-size", WasmPageSize);
- if (!Config->StripDebug && !Config->StripAll && Config->CompressRelocTargets)
+ if (!Config->StripDebug && !Config->StripAll && Config->CompressRelocations)
error("--compress-relocations is incompatible with output debug"
" information. Please pass --strip-debug or --strip-all");
@@ -442,7 +442,7 @@
error("entry point specified for relocatable output file");
if (Config->GcSections)
error("-r and --gc-sections may not be used together");
- if (Config->CompressRelocTargets)
+ if (Config->CompressRelocations)
error("-r -and --compress-relocations may not be used together");
if (Args.hasArg(OPT_undefined))
error("-r -and --undefined may not be used together");
diff --git a/wasm/InputChunks.cpp b/wasm/InputChunks.cpp
index ed65836..87aac5a 100644
--- a/wasm/InputChunks.cpp
+++ b/wasm/InputChunks.cpp
@@ -220,7 +220,7 @@
// This function only computes the final output size. It must be called
// before getSize() is used to calculate of layout of the code section.
void InputFunction::calculateSize() {
- if (!File || !Config->CompressRelocTargets)
+ if (!File || !Config->CompressRelocations)
return;
LLVM_DEBUG(dbgs() << "calculateSize: " << getName() << "\n");
@@ -255,7 +255,7 @@
// Override the default writeTo method so that we can (optionally) write the
// compressed version of the function.
void InputFunction::writeTo(uint8_t *Buf) const {
- if (!File || !Config->CompressRelocTargets)
+ if (!File || !Config->CompressRelocations)
return InputChunk::writeTo(Buf);
Buf += OutputOffset;
diff --git a/wasm/InputChunks.h b/wasm/InputChunks.h
index 2ab4ae8..f899d69 100644
--- a/wasm/InputChunks.h
+++ b/wasm/InputChunks.h
@@ -138,7 +138,7 @@
uint32_t getFunctionInputOffset() const { return getInputSectionOffset(); }
uint32_t getFunctionCodeOffset() const { return Function->CodeOffset; }
uint32_t getSize() const override {
- if (Config->CompressRelocTargets && File) {
+ if (Config->CompressRelocations && File) {
assert(CompressedSize);
return CompressedSize;
}
@@ -165,7 +165,7 @@
protected:
ArrayRef<uint8_t> data() const override {
- assert(!Config->CompressRelocTargets);
+ assert(!Config->CompressRelocations);
return File->CodeSection->Content.slice(getInputSectionOffset(),
Function->Size);
}