4 files changed, 7 insertions, 7 deletions
diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp
index 4d03bdb8ef4..ec726098a54 100644
--- a/clang/lib/CodeGen/CodeGenFunction.cpp
+++ b/clang/lib/CodeGen/CodeGenFunction.cpp
@@ -892,7 +892,7 @@ void CodeGenFunction::GenerateCode(GlobalDecl GD, llvm::Function *Fn,
                  FD->getCorrespondingUnsizedGlobalDeallocationFunction()) {
     // Global sized deallocation functions get an implicit weak definition if
     // they don't have an explicit definition, if allowed.
-    assert(getLangOpts().DefaultSizedDelete &&
+    assert(getLangOpts().DefineSizedDeallocation &&
            "Can't emit unallowed definition.");
     EmitSizedDeallocationFunction(*this, UnsizedDealloc);
 
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 8404972fa09..92c1706a41d 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -1624,7 +1624,7 @@ CodeGenModule::GetOrCreateLLVMFunction(StringRef MangledName,
     } else if (D &&
                cast<FunctionDecl>(D)
                   ->getCorrespondingUnsizedGlobalDeallocationFunction() &&
-               getLangOpts().DefaultSizedDelete &&
+               getLangOpts().DefineSizedDeallocation &&
                !D->hasAttr<AliasAttr>()) {
       addDeferredDeclToEmit(F, GD);
 
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 45f9ac74862..1c149080df7 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -4242,10 +4242,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                     options::OPT_fno_assume_sane_operator_new))
     CmdArgs.push_back("-fno-assume-sane-operator-new");
   
-  // -def-sized-delete: default implementation of sized delete as a
+  // -fdefine-sized-deallocation: default implementation of sized delete as a
   // weak definition.
-  if (Args.hasArg(options::OPT_fdef_sized_delete))
-    CmdArgs.push_back("-fdef-sized-delete");
+  if (Args.hasArg(options::OPT_fdefine_sized_deallocation))
+    CmdArgs.push_back("-fdefine-sized-deallocation");
 
   // -fconstant-cfstrings is default, and may be subject to argument translation
   // on Darwin.
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index b060712f672..7413ae2601d 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -1525,8 +1525,8 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
   Opts.NoMathBuiltin = Args.hasArg(OPT_fno_math_builtin);
   Opts.AssumeSaneOperatorNew = !Args.hasArg(OPT_fno_assume_sane_operator_new);
   Opts.SizedDeallocation |= Args.hasArg(OPT_fsized_deallocation);
-  Opts.DefaultSizedDelete = Opts.SizedDeallocation &&
-      Args.hasArg(OPT_fdef_sized_delete);
+  Opts.DefineSizedDeallocation = Opts.SizedDeallocation &&
+      Args.hasArg(OPT_fdefine_sized_deallocation);
   Opts.HeinousExtensions = Args.hasArg(OPT_fheinous_gnu_extensions);
   Opts.AccessControl = !Args.hasArg(OPT_fno_access_control);
   Opts.ElideConstructors = !Args.hasArg(OPT_fno_elide_constructors);