dcb6d212fd
This reverts commit 4e3b89483a6922d3f48670bb1c50a37f342918c6, with fixes for places I'd missed updating in lld and lldb. I've also renamed OptionVisibility::Default to "DefaultVis" to avoid ambiguity since the undecorated name has to be available anywhere Options.inc is included. Original message follows: This splits OptTable's "Flags" field into "Flags" and "Visibility", updates the places where we instantiate Option tables, and adds variants of the OptTable APIs that use Visibility mask instead of Include/Exclude flags. We need to do this to clean up a bunch of complexity in the clang driver's option handling - there's a whole slew of flags like CoreOption, NoDriverOption, and FlangOnlyOption there today to try to handle all of the permutations of flags that the various drivers need, but it really doesn't scale well, as can be seen by things like the somewhat recently introduced CLDXCOption. Instead, we'll provide an additive model for visibility that's separate from the other flags. For things like "HelpHidden", which is used as a "subtractive" modifier for option visibility, we leave that in "Flags" and handle it as a special case. Note that we don't actually update the users of the Include/Exclude APIs here or change the flags that exist in clang at all - that will come in a follow up that refactors clang's Options.td to use the increased flexibility this change allows. Differential Revision: https://reviews.llvm.org/D157149
79 lines
2.7 KiB
C++
79 lines
2.7 KiB
C++
//===-- COFFDirectiveParser.cpp - JITLink coff directive parser --*- C++ -*===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// MSVC COFF directive parser
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "COFFDirectiveParser.h"
|
|
|
|
#include <array>
|
|
|
|
using namespace llvm;
|
|
using namespace jitlink;
|
|
|
|
#define DEBUG_TYPE "jitlink"
|
|
|
|
// Create prefix string literals used in Options.td
|
|
#define PREFIX(NAME, VALUE) \
|
|
static constexpr StringLiteral NAME##_init[] = VALUE; \
|
|
static constexpr ArrayRef<StringLiteral> NAME(NAME##_init, \
|
|
std::size(NAME##_init) - 1);
|
|
#include "COFFOptions.inc"
|
|
#undef PREFIX
|
|
|
|
static constexpr const StringLiteral PrefixTable_init[] =
|
|
#define PREFIX_UNION(VALUES) VALUES
|
|
#include "COFFOptions.inc"
|
|
#undef PREFIX_UNION
|
|
;
|
|
static constexpr const ArrayRef<StringLiteral>
|
|
PrefixTable(PrefixTable_init, std::size(PrefixTable_init) - 1);
|
|
|
|
// Create table mapping all options defined in COFFOptions.td
|
|
using namespace llvm::opt;
|
|
static constexpr opt::OptTable::Info infoTable[] = {
|
|
#define OPTION(...) \
|
|
LLVM_CONSTRUCT_OPT_INFO_WITH_ID_PREFIX(COFF_OPT_, __VA_ARGS__),
|
|
#include "COFFOptions.inc"
|
|
#undef OPTION
|
|
};
|
|
|
|
class COFFOptTable : public opt::PrecomputedOptTable {
|
|
public:
|
|
COFFOptTable() : PrecomputedOptTable(infoTable, PrefixTable, true) {}
|
|
};
|
|
|
|
static COFFOptTable optTable;
|
|
|
|
Expected<opt::InputArgList> COFFDirectiveParser::parse(StringRef Str) {
|
|
SmallVector<StringRef, 16> Tokens;
|
|
SmallVector<const char *, 16> Buffer;
|
|
cl::TokenizeWindowsCommandLineNoCopy(Str, saver, Tokens);
|
|
for (StringRef Tok : Tokens) {
|
|
bool HasNul = Tok.end() != Str.end() && Tok.data()[Tok.size()] == '\0';
|
|
Buffer.push_back(HasNul ? Tok.data() : saver.save(Tok).data());
|
|
}
|
|
|
|
unsigned missingIndex;
|
|
unsigned missingCount;
|
|
|
|
auto Result = optTable.ParseArgs(Buffer, missingIndex, missingCount);
|
|
|
|
if (missingCount)
|
|
return make_error<JITLinkError>(Twine("COFF directive parsing failed: ") +
|
|
Result.getArgString(missingIndex) +
|
|
" missing argument");
|
|
LLVM_DEBUG({
|
|
for (auto *arg : Result.filtered(COFF_OPT_UNKNOWN))
|
|
dbgs() << "Unknown coff option argument: " << arg->getAsString(Result)
|
|
<< "\n";
|
|
});
|
|
return std::move(Result);
|
|
}
|