diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp
index cc89b0a0315c..804bef4058c9 100644
--- a/clang/tools/driver/driver.cpp
+++ b/clang/tools/driver/driver.cpp
@@ -189,7 +189,7 @@ int main(int argc, const char **argv) {
     ApplyQAOverride(StringPointers, OverrideStr, SavedStrings);
 
     C.reset(TheDriver.BuildCompilation(StringPointers.size(), 
-                                       StringPointers.data()));
+                                       &StringPointers[0]));
   } else if (const char *Cur = ::getenv("CCC_ADD_ARGS")) {
     std::vector<const char*> StringPointers;
 
@@ -213,7 +213,7 @@ int main(int argc, const char **argv) {
     StringPointers.insert(StringPointers.end(), argv + 1, argv + argc);
 
     C.reset(TheDriver.BuildCompilation(StringPointers.size(), 
-                                       StringPointers.data()));
+                                       &StringPointers[0]));
   } else
     C.reset(TheDriver.BuildCompilation(argc, argv));