Driver: Add OptTable::getOptionKind.

Also, removed default value for getOptionMetaVar.

llvm-svn: 68146

2 files changed, 8 insertions, 3 deletions

diff --git a/clang/include/clang/Driver/Options.h b/clang/include/clang/Driver/Options.h
index 83d98dde2cc..8b959d369c0 100644
--- a/clang/include/clang/Driver/Options.h
+++ b/clang/include/clang/Driver/Options.h
@@ -61,6 +61,9 @@ namespace options {
     /// creating it if necessary.
     const Option *getOption(options::ID id) const;
 
+    /// getOptionKind - Get the kind of the given option.
+    unsigned getOptionKind(options::ID id) const;
+
     /// getOptionHelpText - Get the help text to use to describe this
     /// option.
     const char *getOptionHelpText(options::ID id) const;
diff --git a/clang/lib/Driver/OptTable.cpp b/clang/lib/Driver/OptTable.cpp
index 4c198fc24f7..15b121c45b1 100644
--- a/clang/lib/Driver/OptTable.cpp
+++ b/clang/lib/Driver/OptTable.cpp
@@ -137,14 +137,16 @@ const char *OptTable::getOptionName(options::ID id) const {
   return getInfo(id).Name;
 }
 
+unsigned OptTable::getOptionKind(options::ID id) const {
+  return getInfo(id).Kind;
+}
+
 const char *OptTable::getOptionHelpText(options::ID id) const {
   return getInfo(id).HelpText;
 }
 
 const char *OptTable::getOptionMetaVar(options::ID id) const {
-  const char *Name = getInfo(id).MetaVar;
-  // FIXME: This will need translation.
-  return Name ? Name : "<var>";
+  return getInfo(id).MetaVar;
 }
 
 const Option *OptTable::getOption(options::ID id) const {