r198890 - Preserve -fretain-comments-from-system-headers in modules

[Ben Langmuir]

Author: benlangmuir
Date: Thu Jan  9 14:53:49 2014
New Revision: 198890

URL: http://llvm.org/viewvc/llvm-project?rev=198890&view=rev
Log:
Preserve -fretain-comments-from-system-headers in modules

Preserves the setting of -fretain-comments-from-system-headers when
building/saving/loading module files. This allows code completion to pick up
documentation comments from system modules.

Added:
    cfe/trunk/test/Index/Inputs/retain-comments-from-system-headers-module.map
Modified:
    cfe/trunk/include/clang/Basic/LangOptions.def
    cfe/trunk/test/Index/retain-comments-from-system-headers.c

Modified: cfe/trunk/include/clang/Basic/LangOptions.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/LangOptions.def?rev=198890&r1=198889&r2=198890&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/LangOptions.def (original)
+++ cfe/trunk/include/clang/Basic/LangOptions.def Thu Jan  9 14:53:49 2014
@@ -178,7 +178,7 @@ VALUE_LANGOPT(MSCVersion, 32, 0,
 
 LANGOPT(ApplePragmaPack, 1, 0, "Apple gcc-compatible #pragma pack handling")
 
-BENIGN_LANGOPT(RetainCommentsFromSystemHeaders, 1, 0, "retain documentation comments from system headers in the AST")
+LANGOPT(RetainCommentsFromSystemHeaders, 1, 0, "retain documentation comments from system headers in the AST")
 
 #undef LANGOPT
 #undef VALUE_LANGOPT

Added: cfe/trunk/test/Index/Inputs/retain-comments-from-system-headers-module.map
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/Inputs/retain-comments-from-system-headers-module.map?rev=198890&view=auto
==============================================================================
--- cfe/trunk/test/Index/Inputs/retain-comments-from-system-headers-module.map (added)
+++ cfe/trunk/test/Index/Inputs/retain-comments-from-system-headers-module.map Thu Jan  9 14:53:49 2014
@@ -0,0 +1,4 @@
+module retain_comments_from_system_headers {
+  header "retain-comments-from-system-headers.h"
+  export *
+}

Modified: cfe/trunk/test/Index/retain-comments-from-system-headers.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/retain-comments-from-system-headers.c?rev=198890&r1=198889&r2=198890&view=diff
==============================================================================
--- cfe/trunk/test/Index/retain-comments-from-system-headers.c (original)
+++ cfe/trunk/test/Index/retain-comments-from-system-headers.c Thu Jan  9 14:53:49 2014
@@ -11,9 +11,12 @@ int user_function(int a);
 // RUN: c-index-test -test-load-source all %s -I %S/Inputs | FileCheck %s
 // RUN: c-index-test -test-load-source all %s -fretain-comments-from-system-headers -I %S/Inputs | FileCheck %s -check-prefix=CHECK-RETAIN
 
+// Modules:
+// RUN: c-index-test -test-load-source all %s -I %S/Inputs -fmodules -fmodules-cache-path=%t/cache -fmodule-map-file=%S/Inputs/retain-comments-from-system-headers-module.map | FileCheck %s -check-prefix=CHECK
+// RUN: c-index-test -test-load-source all %s -fretain-comments-from-system-headers -I %S/Inputs -fmodules -fmodules-cache-path=%t/cache -fmodule-map-file=%S/Inputs/retain-comments-from-system-headers-module.map | FileCheck %s -check-prefix=CHECK-RETAIN
+
 // CHECK: retain-comments-from-system-headers.h:7:5: FunctionDecl=system_function:7:5 Extent=[7:1 - 7:27]
 // CHECK: retain-comments-from-system-headers.c:9:5: FunctionDecl=user_function:9:5 RawComment=[/**\n * user_function\n * \param a Aaa.\n */] RawCommentRange=[5:1 - 8:4] BriefComment=[user_function]
 
 // CHECK-RETAIN: retain-comments-from-system-headers.h:7:5: FunctionDecl=system_function:7:5 RawComment=[/**\n * system_function\n * \param a Aaa.\n */] RawCommentRange=[3:1 - 6:4] BriefComment=[system_function]
 // CHECK-RETAIN: retain-comments-from-system-headers.c:9:5: FunctionDecl=user_function:9:5 RawComment=[/**\n * user_function\n * \param a Aaa.\n */] RawCommentRange=[5:1 - 8:4] BriefComment=[user_function]
-