1 files changed, 29 insertions, 2 deletions
diff --git a/clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp b/clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp
index 10370f959e2..4c0744fde70 100644
--- a/clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp
+++ b/clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp
@@ -325,13 +325,40 @@ int main(int argc, const char **argv) {
     for (HeaderOverrides::const_iterator HeaderI = Overrides.headers_begin(),
                                          HeaderE = Overrides.headers_end();
          HeaderI != HeaderE; ++HeaderI) {
-      assert(!HeaderI->second.FileOverride.empty() &&
+      assert(!HeaderI->second.getContentOverride().empty() &&
              "A header override should not be empty");
       std::string ErrorInfo;
       std::string HeaderFileName = HeaderI->getKey();
       llvm::raw_fd_ostream HeaderStream(HeaderFileName.c_str(), ErrorInfo,
                                         llvm::sys::fs::F_Binary);
-      HeaderStream << HeaderI->second.FileOverride;
+      if (!ErrorInfo.empty()) {
+        llvm::errs() << "Error opening file: " << ErrorInfo << "\n";
+        continue;
+      }
+      HeaderStream << HeaderI->second.getContentOverride();
+
+      // Replacements for header files need to be written in a YAML file for
+      // every transform and will be merged together with an external tool.
+      llvm::SmallString<128> ReplacementsHeaderName;
+      llvm::SmallString<64> Error;
+      bool Result = generateReplacementsFileName(I->getKey(), HeaderFileName,
+                                                 ReplacementsHeaderName, Error);
+      if (!Result) {
+        llvm::errs() << "Failed to generate replacements filename:" << Error
+                     << "\n";
+        continue;
+      }
+
+      llvm::raw_fd_ostream ReplacementsFile(ReplacementsHeaderName.c_str(),
+                                            ErrorInfo,
+                                            llvm::sys::fs::F_Binary);
+      if (!ErrorInfo.empty()) {
+        llvm::errs() << "Error opening file: " << ErrorInfo << "\n";
+        continue;
+      }
+      llvm::yaml::Output YAML(ReplacementsFile);
+      YAML << const_cast<HeaderChangeDocument &>(
+                  HeaderI->getValue().getHeaderChangeDoc());
     }
   }