diff --git a/include/Support/CommandLine.h b/include/Support/CommandLine.h
index 0d1d14813cd..b7bd62a3807 100644
--- a/include/Support/CommandLine.h
+++ b/include/Support/CommandLine.h
@@ -711,6 +711,9 @@ struct opt_storage<DataType, false, false> {
   void setValue(const T &V) { Value = V; }
   DataType &getValue() { return Value; }
   DataType getValue() const { return Value; }
+
+  // If the datatype is a pointer, support -> on it.
+  DataType operator->() const { return Value; }
 };
 
 
diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h
index 0d1d14813cd..b7bd62a3807 100644
--- a/include/llvm/Support/CommandLine.h
+++ b/include/llvm/Support/CommandLine.h
@@ -711,6 +711,9 @@ struct opt_storage<DataType, false, false> {
   void setValue(const T &V) { Value = V; }
   DataType &getValue() { return Value; }
   DataType getValue() const { return Value; }
+
+  // If the datatype is a pointer, support -> on it.
+  DataType operator->() const { return Value; }
 };