From 62ba4ba4852b3dc3a8c1c77b34b58a06077387d8 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis <akyrtzi@gmail.com> Date: Mon, 18 Mar 2013 22:55:24 +0000 Subject: [PATCH] [frontend] Initialize the diagnostic client before loading an ast file. Issue reported by Tom Honermann! http://llvm.org/bugs/show_bug.cgi?id=15377 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177336 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Frontend/FrontendAction.cpp | 4 ++++ test/Frontend/ast-main.cpp | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 test/Frontend/ast-main.cpp diff --git a/lib/Frontend/FrontendAction.cpp b/lib/Frontend/FrontendAction.cpp index 6d31c315b4b..c47423c0875 100644 --- a/lib/Frontend/FrontendAction.cpp +++ b/lib/Frontend/FrontendAction.cpp @@ -188,6 +188,10 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI, setCurrentInput(Input, AST); + // Inform the diagnostic client we are processing a source file. + CI.getDiagnosticClient().BeginSourceFile(CI.getLangOpts(), 0); + HasBegunSourceFile = true; + // Set the shared objects, these are reset when we finish processing the // file, otherwise the CompilerInstance will happily destroy them. CI.setFileManager(&AST->getFileManager()); diff --git a/test/Frontend/ast-main.cpp b/test/Frontend/ast-main.cpp new file mode 100644 index 00000000000..d3d8471cfc6 --- /dev/null +++ b/test/Frontend/ast-main.cpp @@ -0,0 +1,22 @@ +// RUN: %clang -emit-llvm -S -o %t1.ll -x c++ - < %s +// RUN: %clang -emit-ast -o %t.ast %s +// RUN: %clang -emit-llvm -S -o %t2.ll -x ast - < %t.ast +// RUN: diff %t1.ll %t2.ll + +// http://llvm.org/bugs/show_bug.cgi?id=15377 +template<typename T> +struct S { + T *mf(); +}; +template<typename T> +T *S<T>::mf() { + // warning: control reaches end of non-void function [-Wreturn-type] +} + +void f() { + S<int>().mf(); +} + +int main() { + return 0; +} -- GitLab