maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[WebAssembly] Error if both --export-table and --import-table are specified. 

Differential Revision: https://reviews.llvm.org/D45001

llvm-svn: 328873
This commit is contained in:
Rui Ueyama 2018-03-30 16:06:14 +00:00
parent e09b7dcf3d
commit 0961218c10
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/test/wasm/driver.ll
View File

@ -16,3 +16,7 @@ entry:
; RUN: not wasm-ld 2>&1 | FileCheck -check-prefix=BOTH %s
; BOTH: error: no input files
; BOTH-NOT: error: no output file specified
; RUN: not wasm-ld --export-table --import-table %t.o 2>&1 \
; RUN: | FileCheck -check-prefix=TABLE %s
; TABLE: error: --import-table and --export-table may not be used together

10
lld/wasm/Driver.cpp
View File

@ -286,7 +286,9 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
Args.hasFlag(OPT_check_signatures, OPT_no_check_signatures, false);
Config->Demangle = Args.hasFlag(OPT_demangle, OPT_no_demangle, true);
Config->Entry = getEntry(Args, Args.hasArg(OPT_relocatable) ? "" : "_start");
Config->ExportTable = Args.hasArg(OPT_export_table);
Config->ImportMemory = Args.hasArg(OPT_import_memory);
Config->ImportTable = Args.hasArg(OPT_import_table);
Config->OutputFile = Args.getLastArgValue(OPT_o);
Config->Relocatable = Args.hasArg(OPT_relocatable);
Config->GcSections =
@ -296,11 +298,6 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
Config->SearchPaths = args::getStrings(Args, OPT_L);
Config->StripAll = Args.hasArg(OPT_strip_all);
Config->StripDebug = Args.hasArg(OPT_strip_debug);
auto *TableArg = Args.getLastArg(OPT_import_table, OPT_export_table);
Config->ImportTable =
TableArg && TableArg->getOption().getID() == OPT_import_table;
Config->ExportTable =
TableArg && TableArg->getOption().getID() == OPT_export_table;
errorHandler().Verbose = Args.hasArg(OPT_verbose);
ThreadsEnabled = Args.hasFlag(OPT_threads, OPT_no_threads, true);
@ -321,6 +318,9 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
if (Config->OutputFile.empty())
error("no output file specified");
if (Config->ImportTable && Config->ExportTable)
error("--import-table and --export-table may not be used together");
if (Config->Relocatable) {
if (!Config->Entry.empty())
error("entry point specified for relocatable output file");