forked from OSchip/llvm-project
Support '#pragma once' in headers when using PCH
The '#pragma once' directive was erroneously ignored when encountered in the header-file specified in generate-PCH-mode. This resulted in compile-time errors in some cases with legal code, and also a misleading warning being produced. Patch by Warren Ristow! Differential Revision: http://reviews.llvm.org/D19815 llvm-svn: 276653
This commit is contained in:
parent
0cdbe7a572
commit
fe58327146
|
@ -352,7 +352,9 @@ void Preprocessor::HandleMicrosoft__pragma(Token &Tok) {
|
|||
/// HandlePragmaOnce - Handle \#pragma once. OnceTok is the 'once'.
|
||||
///
|
||||
void Preprocessor::HandlePragmaOnce(Token &OnceTok) {
|
||||
if (isInPrimaryFile()) {
|
||||
// Don't honor the 'once' when handling the primary source file, unless
|
||||
// this is a prefix to a TU, which indicates we're generating a PCH file.
|
||||
if (isInPrimaryFile() && TUKind != TU_Prefix) {
|
||||
Diag(OnceTok, diag::pp_pragma_once_in_main_file);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
#pragma once
|
||||
|
||||
/* For use with the pragma-once.c test */
|
||||
|
||||
int x = 3;
|
|
@ -0,0 +1,13 @@
|
|||
// Test this without pch.
|
||||
// RUN: %clang_cc1 -include %S/Inputs/pragma-once.h -fsyntax-only -verify %s
|
||||
|
||||
// Test with pch.
|
||||
// RUN: %clang_cc1 -emit-pch -o %t %S/Inputs/pragma-once.h
|
||||
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s
|
||||
|
||||
// expected-no-diagnostics
|
||||
|
||||
// Including "pragma-once.h" twice, to verify the 'once' aspect is honored.
|
||||
#include "Inputs/pragma-once.h"
|
||||
#include "Inputs/pragma-once.h"
|
||||
int foo(void) { return 0; }
|
Loading…
Reference in New Issue