From a9f2368a4016901b5e2ed109b1eead2835ca8242 Mon Sep 17 00:00:00 2001 From: Sebastian Redl Date: Wed, 28 Jul 2010 21:38:49 +0000 Subject: [PATCH] Support extended vector types in chained PCH. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@109675 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Frontend/PCHReader.cpp | 11 ++++++----- test/PCH/Inputs/chain-ext_vector1.h | 3 +++ test/PCH/Inputs/chain-ext_vector2.h | 3 +++ test/PCH/chain-ext_vector.c | 11 +++++++++++ 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 test/PCH/Inputs/chain-ext_vector1.h create mode 100644 test/PCH/Inputs/chain-ext_vector2.h create mode 100644 test/PCH/chain-ext_vector.c diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp index bdc02020b4..69922b0d0f 100644 --- a/lib/Frontend/PCHReader.cpp +++ b/lib/Frontend/PCHReader.cpp @@ -1685,11 +1685,12 @@ PCHReader::ReadPCHBlock(PerFileData &F) { } case pch::EXT_VECTOR_DECLS: - if (!ExtVectorDecls.empty()) { - Error("duplicate EXT_VECTOR_DECLS record in PCH file"); - return Failure; - } - ExtVectorDecls.swap(Record); + // Optimization for the first block. + if (ExtVectorDecls.empty()) + ExtVectorDecls.swap(Record); + else + ExtVectorDecls.insert(ExtVectorDecls.end(), + Record.begin(), Record.end()); break; case pch::VTABLE_USES: diff --git a/test/PCH/Inputs/chain-ext_vector1.h b/test/PCH/Inputs/chain-ext_vector1.h new file mode 100644 index 0000000000..51093364c9 --- /dev/null +++ b/test/PCH/Inputs/chain-ext_vector1.h @@ -0,0 +1,3 @@ +// First header file for chain-ext_vector.c PCH test + +typedef __attribute__((ext_vector_type(2))) float float2; diff --git a/test/PCH/Inputs/chain-ext_vector2.h b/test/PCH/Inputs/chain-ext_vector2.h new file mode 100644 index 0000000000..bdaeccc130 --- /dev/null +++ b/test/PCH/Inputs/chain-ext_vector2.h @@ -0,0 +1,3 @@ +// Second header file for chain-ext_vector.c PCH test + +typedef __attribute__((ext_vector_type(4))) float float4; diff --git a/test/PCH/chain-ext_vector.c b/test/PCH/chain-ext_vector.c new file mode 100644 index 0000000000..263507003d --- /dev/null +++ b/test/PCH/chain-ext_vector.c @@ -0,0 +1,11 @@ +// Test this without pch. +// RUN: %clang_cc1 -include %S/Inputs/chain-ext_vector1.h -include %S/Inputs/chain-ext_vector2.h -fsyntax-only -verify %s + +// Test with pch. +// RUN: %clang_cc1 -emit-pch -o %t1 %S/Inputs/chain-ext_vector1.h +// RUN: %clang_cc1 -emit-pch -o %t2 %S/Inputs/chain-ext_vector2.h -include-pch %t1 -chained-pch +// RUN: %clang_cc1 -include-pch %t2 -fsyntax-only -verify %s + +int test(float4 f4) { + return f4.xy; // expected-error{{float2}} +} -- 2.50.1