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

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Fri Mar 30 09:06:14 2018
New Revision: 328873

URL: http://llvm.org/viewvc/llvm-project?rev=328873&view=rev
Log:
[WebAssembly] Error if both --export-table and --import-table are specified.

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

Modified:
    lld/trunk/test/wasm/driver.ll
    lld/trunk/wasm/Driver.cpp

Modified: lld/trunk/test/wasm/driver.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/driver.ll?rev=328873&r1=328872&r2=328873&view=diff
==============================================================================
--- lld/trunk/test/wasm/driver.ll (original)
+++ lld/trunk/test/wasm/driver.ll Fri Mar 30 09:06:14 2018
@@ -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

Modified: lld/trunk/wasm/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Driver.cpp?rev=328873&r1=328872&r2=328873&view=diff
==============================================================================
--- lld/trunk/wasm/Driver.cpp (original)
+++ lld/trunk/wasm/Driver.cpp Fri Mar 30 09:06:14 2018
@@ -286,7 +286,9 @@ void LinkerDriver::link(ArrayRef<const c
       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 c
   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 c
   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");