This is an archive of the discontinued LLVM Phabricator instance.

Fix Modules/builtin-import.mm to be able to handle non-Darwin targets
ClosedPublic

Authored by filcab on Sep 28 2017, 8:21 AM.

Reviewers

bruno
rsmith

Commits

Summary

Also makes it pass on Darwin, if the default target triple is a Linux triple.

Add umbrella-header-include-builtin.mm too

Thanks Filipe, LGTM

This revision is now accepted and ready to land.Sep 28 2017, 10:36 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

cfe/

trunk/

test/

Modules/

4 lines

4 lines

	// REQUIRES: system-darwin

	// RUN: rm -rf %t			// RUN: rm -rf %t
	// RUN: %clang -cc1 -fsyntax-only -nostdinc++ -isysroot %S/Inputs/libc-libcxx/sysroot -isystem %S/Inputs/libc-libcxx/sysroot/usr/include/c++/v1 -std=c++11 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c++ -fmodules-local-submodule-visibility %s			// RUN: %clang -cc1 -fsyntax-only -nobuiltininc -nostdinc++ -isysroot %S/Inputs/libc-libcxx/sysroot -isystem %S/Inputs/libc-libcxx/sysroot/usr/include/c++/v1 -isystem %S/Inputs/libc-libcxx/sysroot/usr/include -std=c++11 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c++ -fmodules-local-submodule-visibility %s

	#include <stdio.h>			#include <stdio.h>
	#include <stddef.h>			#include <stddef.h>
	#include <cstddef>			#include <cstddef>

	typedef ptrdiff_t try1_ptrdiff_t;			typedef ptrdiff_t try1_ptrdiff_t;
	typedef my_ptrdiff_t try2_ptrdiff_t;			typedef my_ptrdiff_t try2_ptrdiff_t;

	// REQUIRES: system-darwin

	// RUN: rm -rf %t			// RUN: rm -rf %t
	// RUN: %clang -cc1 -fsyntax-only -nostdinc++ -isysroot %S/Inputs/libc-libcxx/sysroot -isystem %S/Inputs/libc-libcxx/sysroot/usr/include/c++/v1 -F%S/Inputs/libc-libcxx/sysroot/Frameworks -std=c++11 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c++ %s			// RUN: %clang -cc1 -fsyntax-only -nobuiltininc -nostdinc++ -isysroot %S/Inputs/libc-libcxx/sysroot -isystem %S/Inputs/libc-libcxx/sysroot/usr/include/c++/v1 -isystem %S/Inputs/libc-libcxx/sysroot/usr/include -F%S/Inputs/libc-libcxx/sysroot/Frameworks -std=c++11 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c++ %s

	#include <A/A.h>			#include <A/A.h>

	// RUN: rm -rf %t			// RUN: rm -rf %t
	// RUN: mkdir %t			// RUN: mkdir %t
	// RUN: echo "module NonExistent1 { umbrella \"NonExistent\" }" > %t/modules.modulemap			// RUN: echo "module NonExistent1 { umbrella \"NonExistent\" }" > %t/modules.modulemap
	// RUN: echo "" > %t/A.h			// RUN: echo "" > %t/A.h
	// RUN: echo "#include \"A.h\" int i;" > %t/T.cxx			// RUN: echo "#include \"A.h\" int i;" > %t/T.cxx
	// RUN: %clang -I %t -fmodules -fsyntax-only %t/T.cxx			// RUN: %clang -I %t -fmodules -fsyntax-only %t/T.cxx
	// expected-warning {{ umbrella directory }}			// expected-warning {{ umbrella directory }}