This is an archive of the discontinued LLVM Phabricator instance.

Fix argument numbering in OPTION macro
ClosedPublic

Authored by sbc100 on Jun 20 2017, 12:14 PM.

Reviewers

Commits

Summary

The option numbers in the macro were off by one which
leads to some confusion. There are actually 12 arguments
to this macro.

sbc100 retitled this revision from Fix argument numbersing in OPTION macro to Fix argument numbering in OPTION macro.Jun 20 2017, 12:15 PM

sbc100 added a reviewer: ruiu.

LGTM. Thank you for fixing this!

This revision is now accepted and ready to land.Jun 20 2017, 12:16 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

lld/

trunk/

COFF/

6 lines

ELF/

6 lines

	Show First 20 Lines • Show All 634 Lines • ▼ Show 20 Lines

	// Create prefix string literals used in Options.td			// Create prefix string literals used in Options.td
	#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;			#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
	#include "Options.inc"			#include "Options.inc"
	#undef PREFIX			#undef PREFIX

	// Create table mapping all options defined in Options.td			// Create table mapping all options defined in Options.td
	static const llvm::opt::OptTable::Info infoTable[] = {			static const llvm::opt::OptTable::Info infoTable[] = {
	#define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X6, X7, X8, X9, X10, X11) \			#define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X7, X8, X9, X10, X11, X12) \
	{X1, X2, X9, X10, OPT_##ID, llvm::opt::Option::KIND##Class, \			{X1, X2, X10, X11, OPT_##ID, llvm::opt::Option::KIND##Class, \
	X8, X7, OPT_##GROUP, OPT_##ALIAS, X6, X11},			X9, X8, OPT_##GROUP, OPT_##ALIAS, X7, X12},
	#include "Options.inc"			#include "Options.inc"
	#undef OPTION			#undef OPTION
	};			};

	class COFFOptTable : public llvm::opt::OptTable {			class COFFOptTable : public llvm::opt::OptTable {
	public:			public:
	COFFOptTable() : OptTable(infoTable, true) {}			COFFOptTable() : OptTable(infoTable, true) {}
	};			};
	▲ Show 20 Lines • Show All 65 Lines • Show Last 20 Lines

	Show All 36 Lines

	// Create prefix string literals used in Options.td			// Create prefix string literals used in Options.td
	#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;			#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
	#include "Options.inc"			#include "Options.inc"
	#undef PREFIX			#undef PREFIX

	// Create table mapping all options defined in Options.td			// Create table mapping all options defined in Options.td
	static const opt::OptTable::Info OptInfo[] = {			static const opt::OptTable::Info OptInfo[] = {
	#define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X6, X7, X8, X9, X10, X11) \			#define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X7, X8, X9, X10, X11, X12) \
	{X1, X2, X9, X10, OPT_##ID, opt::Option::KIND##Class, \			{X1, X2, X10, X11, OPT_##ID, opt::Option::KIND##Class, \
	X8, X7, OPT_##GROUP, OPT_##ALIAS, X6, X11},			X9, X8, OPT_##GROUP, OPT_##ALIAS, X7, X12},
	#include "Options.inc"			#include "Options.inc"
	#undef OPTION			#undef OPTION
	};			};

	ELFOptTable::ELFOptTable() : OptTable(OptInfo) {}			ELFOptTable::ELFOptTable() : OptTable(OptInfo) {}

	// Parse -color-diagnostics={auto,always,never} or -no-color-diagnostics.			// Parse -color-diagnostics={auto,always,never} or -no-color-diagnostics.
	static bool getColorDiagnostics(opt::InputArgList &Args) {			static bool getColorDiagnostics(opt::InputArgList &Args) {
	▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines