Roll Clang 214024:216630 (+216684) and switch to CMake (try 2)

tools/clang/blink_gc_plugin/BlinkGCPlugin.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This clang plugin checks various invariants of the Blink garbage
 // collection infrastructure.
 //
 // Errors are described at:
 // http://www.chromium.org/developers/blink-gc-plugin-errors
 
@@ skipping 847 matching lines @@
         DiagnosticsEngine::Note, kOverriddenNonVirtualTraceNote);
     diag_manual_dispatch_method_note_ = diagnostic_.getCustomDiagID(
         DiagnosticsEngine::Note, kManualDispatchMethodNote);
   }
 
   void HandleTranslationUnit(ASTContext& context) override {
     CollectVisitor visitor;
     visitor.TraverseDecl(context.getTranslationUnitDecl());
 
     if (options_.dump_graph) {
-      string err;
+      std::error_code err;
       // TODO: Make createDefaultOutputFile or a shorter createOutputFile work.
       json_ = JsonWriter::from(instance_.createOutputFile(
           "",                                      // OutputPath
           err,                                     // Errors
           true,                                    // Binary
           true,                                    // RemoveFileOnSignal
           instance_.getFrontendOpts().OutputFile,  // BaseInput
           "graph.json",                            // Extension
           false,                                   // UseTemporary
           false,                                   // CreateMissingDirectories
           0,                                       // ResultPathName
           0));                                     // TempPathName
-      if (err.empty() && json_) {
+      if (!err && json_) {
         json_->OpenList();
       } else {
         json_ = 0;
         llvm::errs()
             << "[blink-gc] "
             << "Failed to create an output file for the object graph.\n";
       }
     }
 
     for (RecordVector::iterator it = visitor.record_decls().begin();
@@ skipping 945 matching lines @@
   RecordCache cache_;
   JsonWriter* json_;
 };
 
 class BlinkGCPluginAction : public PluginASTAction {
  public:
   BlinkGCPluginAction() {}
 
  protected:
   // Overridden from PluginASTAction:
-  virtual ASTConsumer* CreateASTConsumer(CompilerInstance& instance,
-                                         llvm::StringRef ref) {
-    return new BlinkGCPluginConsumer(instance, options_);
+  virtual std::unique_ptr<ASTConsumer> CreateASTConsumer(
+      CompilerInstance& instance,
+      llvm::StringRef ref) {
+    return llvm::make_unique<BlinkGCPluginConsumer>(instance, options_);
   }
 
   virtual bool ParseArgs(const CompilerInstance& instance,
                          const std::vector<string>& args) {
     bool parsed = true;
 
     for (size_t i = 0; i < args.size() && parsed; ++i) {
       if (args[i] == "enable-oilpan") {
         options_.enable_oilpan = true;
       } else if (args[i] == "dump-graph") {
@@ skipping 13 matching lines @@
 
  private:
   BlinkGCPluginOptions options_;
 };
 
 }  // namespace
 
 static FrontendPluginRegistry::Add<BlinkGCPluginAction> X(
     "blink-gc-plugin",
     "Check Blink GC invariants");