-Rename -Wargument-larger-than -> -Wlarge-by-value-copy
-Improve the diagnostic message
-Add some comments
Suggestions by Chris.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@119594 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index d9e3760..60d2fe3 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1199,13 +1199,13 @@
CmdArgs.push_back(A->getValue(Args));
}
- if (Arg *A = Args.getLastArg(options::OPT_Wargument_larger_than_EQ,
- options::OPT_Wargument_larger_than_def)) {
- CmdArgs.push_back("-Wargument-larger-than");
+ if (Arg *A = Args.getLastArg(options::OPT_Wlarge_by_value_copy_EQ,
+ options::OPT_Wlarge_by_value_copy_def)) {
+ CmdArgs.push_back("-Wlarge-by-value-copy");
if (A->getNumValues())
CmdArgs.push_back(A->getValue(Args));
else
- CmdArgs.push_back("64"); // default value for -Wargument-larger-than
+ CmdArgs.push_back("64"); // default value for -Wlarge-by-value-copy.
}
if (Args.hasArg(options::OPT__relocatable_pch))
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 466dfbd..b1d6adb 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -1373,7 +1373,7 @@
Opts.MathErrno = Args.hasArg(OPT_fmath_errno);
Opts.InstantiationDepth = Args.getLastArgIntValue(OPT_ftemplate_depth, 1024,
Diags);
- Opts.ArgumentLargerThan = Args.getLastArgIntValue(OPT_Wargument_larger_than,
+ Opts.NumLargeByValueCopy = Args.getLastArgIntValue(OPT_Wlarge_by_value_copy,
0, Diags);
Opts.NeXTRuntime = !Args.hasArg(OPT_fgnu_runtime);
Opts.ObjCConstantStringClass =
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index dc017d2..d36bd17 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -4869,14 +4869,16 @@
ParmVarDecl * const *ParamEnd,
QualType ReturnTy,
NamedDecl *D) {
- if (LangOpts.ArgumentLargerThan == 0) // No check.
+ if (LangOpts.NumLargeByValueCopy == 0) // No check.
return;
+ // Warn if the return value is pass-by-value and larger than the specified
+ // threshold.
if (ReturnTy->isPODType() &&
Diags.getDiagnosticLevel(diag::warn_return_value_size) !=
Diagnostic::Ignored) {
unsigned Size = Context.getTypeSizeInChars(ReturnTy).getQuantity();
- if (Size > LangOpts.ArgumentLargerThan)
+ if (Size > LangOpts.NumLargeByValueCopy)
Diag(D->getLocation(), diag::warn_return_value_size)
<< D->getDeclName() << Size;
}
@@ -4884,12 +4886,14 @@
if (Diags.getDiagnosticLevel(diag::warn_parameter_size)==Diagnostic::Ignored)
return;
+ // Warn if any parameter is pass-by-value and larger than the specified
+ // threshold.
for (; Param != ParamEnd; ++Param) {
QualType T = (*Param)->getType();
if (!T->isPODType())
continue;
unsigned Size = Context.getTypeSizeInChars(T).getQuantity();
- if (Size > LangOpts.ArgumentLargerThan)
+ if (Size > LangOpts.NumLargeByValueCopy)
Diag((*Param)->getLocation(), diag::warn_parameter_size)
<< (*Param)->getDeclName() << Size;
}