Vendor import of clang trunk r239412:vendor/clang/clang-trunk-r239412

https://llvm.org/svn/llvm-project/cfe/trunk@239412

3 files changed, 5 insertions, 5 deletions

diff --git a/tools/clang-format/clang-format.py b/tools/clang-format/clang-format.py
index 56a6e5d86bf4..49ca773b049d 100644
--- a/tools/clang-format/clang-format.py
+++ b/tools/clang-format/clang-format.py
@@ -85,6 +85,8 @@ def main():
     for op in reversed(sequence.get_opcodes()):
       if op[0] is not 'equal':
         vim.current.buffer[op[1]:op[2]] = lines[op[3]:op[4]]
+    if output.get('IncompleteFormat'):
+      print 'clang-format: incomplete (syntax errors)'
     vim.command('goto %d' % (output['Cursor'] + 1))
 
 main()
diff --git a/tools/driver/cc1as_main.cpp b/tools/driver/cc1as_main.cpp
index 6feffa8a63d5..f73d07bd0be9 100644
--- a/tools/driver/cc1as_main.cpp
+++ b/tools/driver/cc1as_main.cpp
@@ -173,10 +173,8 @@ bool AssemblerInvocation::CreateFromArgs(AssemblerInvocation &Opts,
   }
 
   // Issue errors on unknown arguments.
-  for (arg_iterator it = Args->filtered_begin(OPT_UNKNOWN),
-                    ie = Args->filtered_end();
-       it != ie; ++it) {
-    Diags.Report(diag::err_drv_unknown_argument) << (*it)->getAsString(*Args);
+  for (const Arg *A : Args->filtered(OPT_UNKNOWN)) {
+    Diags.Report(diag::err_drv_unknown_argument) << A->getAsString(*Args);
     Success = false;
   }
 
diff --git a/tools/libclang/CXType.cpp b/tools/libclang/CXType.cpp
index 015dd6e57af0..1318e86b5553 100644
--- a/tools/libclang/CXType.cpp
+++ b/tools/libclang/CXType.cpp
@@ -490,7 +490,7 @@ CXString clang_getTypeKindSpelling(enum CXTypeKind K) {
 }
 
 unsigned clang_equalTypes(CXType A, CXType B) {
-  return A.data[0] == B.data[0] && A.data[1] == B.data[1];;
+  return A.data[0] == B.data[0] && A.data[1] == B.data[1];
 }
 
 unsigned clang_isFunctionTypeVariadic(CXType X) {