averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2017-05-02 11:08:38 -07:00
parent 7bd71ca5de 534db2c1bb
commit 60858a3472
11 changed files with 116 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Frontend/CompilerInvocation.cpp
View File

@@ -898,7 +898,8 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
Opts.UseMalloc |= Args.hasArg(OPT_use_malloc);
Opts.DiagnosticsEditorMode |= Args.hasArg(OPT_diagnostics_editor_mode);
Opts.DiagnosticsEditorMode |= Args.hasArg(OPT_diagnostics_editor_mode,
OPT_serialize_diagnostics_path);
Opts.EnableExperimentalPropertyBehaviors |=
Args.hasArg(OPT_enable_experimental_property_behaviors);