From 8db835a6f76cccc41fdf534ee358dd59ab73fefe Mon Sep 17 00:00:00 2001
From: Mark Doffman <mark.doffman@codethink.co.uk>
Date: Tue, 30 Dec 2014 16:46:12 +0000
Subject: Revert source management API change for google stable branch.

---
 lib/CodeGen/CodeGenAction.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/CodeGen/CodeGenAction.cpp b/lib/CodeGen/CodeGenAction.cpp
index 4398b6c7e4..53ee5aafd3 100644
--- a/lib/CodeGen/CodeGenAction.cpp
+++ b/lib/CodeGen/CodeGenAction.cpp
@@ -120,7 +120,8 @@ namespace flang {
       // Link LinkModule into this module if present, preserving its validity.
       if (LinkModule) {
         std::string ErrorMsg;
-        if (Linker::LinkModules(M, LinkModule.get())) {
+        if (Linker::LinkModules(M, LinkModule.get(), Linker::PreserveSource,
+                                &ErrorMsg)) {
           Diags.Report(diag::err_fe_cannot_link_module)
             << LinkModule->getModuleIdentifier() << ErrorMsg;
           return;
-- 
cgit v1.2.1