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

This commit is contained in:
Bob Wilson
2018-11-14 11:03:56 -08:00
70 changed files with 942 additions and 1779 deletions

View File

@@ -141,7 +141,7 @@ CompilerInvocation::computeSerializationOptions(const SupplementaryOutputPaths &
// so only serialize them if the module isn't going to be shipped to
// the public.
serializationOpts.SerializeOptionsForDebugging =
!moduleIsPublic || opts.AlwaysSerializeDebuggingOptions;
opts.SerializeOptionsForDebugging.getValueOr(!moduleIsPublic);
return serializationOpts;
}