Remove IRGenOptions objc-interop flag.

Swift SVN r23166
This commit is contained in:
Graham Batty
2014-11-07 22:39:13 +00:00
parent a99affea1f
commit c835beb0b8
3 changed files with 2 additions and 11 deletions

View File

@@ -93,15 +93,12 @@ public:
/// Special codegen for playgrounds.
unsigned Playground : 1;
/// Enable Objective-C interop code generation
unsigned EnableObjCInterop : 1;
IRGenOptions() : OutputKind(IRGenOutputKind::LLVMAssembly), Verify(true),
Optimize(false), DebugInfo(false), UseJIT(false),
EnableDynamicValueTypeLayout(false),
DisableLLVMOptzns(false), DisableLLVMARCOpts(false),
DisableFPElim(true), HasUnderlyingModule(false),
Playground(false), EnableObjCInterop(true) {}
Playground(false) {}
};
} // end namespace swift

View File

@@ -947,12 +947,6 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
if (const Arg *A = Args.getLastArg(OPT_target))
Opts.Triple = llvm::Triple::normalize(A->getValue());
if (auto A = Args.getLastArg(OPT_enable_objc_interop,
OPT_disable_objc_interop)) {
Opts.EnableObjCInterop
= A->getOption().matches(OPT_enable_objc_interop);
}
// TODO: investigate whether these should be removed, in favor of definitions
// in other classes.
if (FrontendOpts.PrimaryInput && FrontendOpts.PrimaryInput->isFilename()) {

View File

@@ -97,7 +97,7 @@ IRGenModule::IRGenModule(ASTContext &Context,
Module(*ClangCodeGen->GetModule()),
LLVMContext(Module.getContext()), DataLayout(DataLayout),
SILMod(SILMod), TargetInfo(SwiftTargetInfo::get(*this)),
DebugInfo(0), ObjCInterop(Opts.EnableObjCInterop),
DebugInfo(0), ObjCInterop(Context.LangOpts.EnableObjCInterop),
Types(*new TypeConverter(*this))
{
VoidTy = llvm::Type::getVoidTy(getLLVMContext());