This is an archive of the discontinued LLVM Phabricator instance.

Make -fmodules-decluse and -fmodules-strict-decluse compatible options.
ClosedPublic

Authored by djasper on Feb 17 2015, 9:02 AM.

Download Raw Diff

Details

Reviewers

klimek
rsmith

Summary

They don't actually influence the result of the module compilation.

Diff Detail

Event Timeline

djasper updated this revision to Diff 20091.Feb 17 2015, 9:02 AM

djasper retitled this revision from to Make -fmodules-decluse and -fmodules-strict-decluse compatible options..

djasper updated this object.

djasper edited the test plan for this revision. (Show Details)

djasper added reviewers: rsmith, klimek.

djasper added a subscriber: Unknown Object (MLST).

LGTM

This revision is now accepted and ready to land.Feb 18 2015, 7:29 PM

djasper closed this revision.Feb 19 2015, 8:01 AM

Revision Contents

Path

Size

include/

clang/

Basic/

LangOptions.def

4 lines

test/

Modules/

declare-use-compatible.cpp

36 lines

Diff 20091

include/clang/Basic/LangOptions.def

Context not available.
	LANGOPT(MathErrno , 1, 1, "errno support for math functions")	LANGOPT(MathErrno , 1, 1, "errno support for math functions")
	BENIGN_LANGOPT(HeinousExtensions , 1, 0, "Extensions that we really don't like and may be ripped out at any time")	BENIGN_LANGOPT(HeinousExtensions , 1, 0, "Extensions that we really don't like and may be ripped out at any time")
	LANGOPT(Modules , 1, 0, "modules extension to C")	LANGOPT(Modules , 1, 0, "modules extension to C")
	LANGOPT(ModulesDeclUse , 1, 0, "require declaration of module uses")	COMPATIBLE_LANGOPT(ModulesDeclUse , 1, 0, "require declaration of module uses")
	LANGOPT(ModulesSearchAll , 1, 1, "search even non-imported modules to find unresolved references")	LANGOPT(ModulesSearchAll , 1, 1, "search even non-imported modules to find unresolved references")
	LANGOPT(ModulesStrictDeclUse, 1, 0, "require declaration of module uses and all headers to be in modules")	COMPATIBLE_LANGOPT(ModulesStrictDeclUse, 1, 0, "require declaration of module uses and all headers to be in modules")
	LANGOPT(ModulesErrorRecovery, 1, 1, "automatically import modules as needed when performing error recovery")	LANGOPT(ModulesErrorRecovery, 1, 1, "automatically import modules as needed when performing error recovery")
	BENIGN_LANGOPT(ModulesImplicitMaps, 1, 1, "use files called module.modulemap implicitly as module maps")	BENIGN_LANGOPT(ModulesImplicitMaps, 1, 1, "use files called module.modulemap implicitly as module maps")
	COMPATIBLE_LANGOPT(Optimize , 1, 0, "__OPTIMIZE__ predefined macro")	COMPATIBLE_LANGOPT(Optimize , 1, 0, "__OPTIMIZE__ predefined macro")
Context not available.

test/Modules/declare-use-compatible.cpp

This file was added.

				// Used module not built with -decluse.
				// RUN: rm -rf %t
				// RUN: %clang_cc1 -x c++ -fmodules -fmodule-name=XB -emit-module \
				// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.map -o %t/b.pcm
				// RUN: %clang_cc1 -x c++ -fmodules -fmodules-cache-path=%t \
				// RUN: -fmodules-decluse \
				// RUN: -fmodule-file=%t/b.pcm -fmodule-name=XE -I %S/Inputs/declare-use %s
				//
				// Main module not built with -decluse.
				// RUN: rm -rf %t
				// RUN: %clang_cc1 -x c++ -fmodules -fmodule-name=XB -emit-module \
				// RUN: -fmodules-decluse \
				// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.map -o %t/b.pcm
				// RUN: %clang_cc1 -x c++ -fmodules -fmodules-cache-path=%t \
				// RUN: -fmodule-file=%t/b.pcm -fmodule-name=XE -I %S/Inputs/declare-use %s
				//
				// Used module not built with -decluse.
				// RUN: rm -rf %t
				// RUN: %clang_cc1 -x c++ -fmodules -fmodule-name=XB -emit-module \
				// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.map -o %t/b.pcm
				// RUN: %clang_cc1 -x c++ -fmodules -fmodules-cache-path=%t \
				// RUN: -fmodules-strict-decluse \
				// RUN: -fmodule-file=%t/b.pcm -fmodule-name=XE -I %S/Inputs/declare-use %s
				//
				// Main module not built with -decluse.
				// RUN: rm -rf %t
				// RUN: %clang_cc1 -x c++ -fmodules -fmodule-name=XB -emit-module \
				// RUN: -fmodules-strict-decluse \
				// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.map -o %t/b.pcm
				// RUN: %clang_cc1 -x c++ -fmodules -fmodules-cache-path=%t \
				// RUN: -fmodule-file=%t/b.pcm -fmodule-name=XE -I %S/Inputs/declare-use %s

				#include "b.h"

				const int g = b;