r230112 - Move -fdefine-sized-deallocation and -fno-sized-deallocation options from driver into CC1 for now.

[Larisse Voufo]

Author: lvoufo
Date: Fri Feb 20 19:03:48 2015
New Revision: 230112

URL: http://llvm.org/viewvc/llvm-project?rev=230112&view=rev
Log:
Move -fdefine-sized-deallocation and -fno-sized-deallocation options from driver into CC1 for now.

Modified:
    cfe/trunk/include/clang/Driver/CC1Options.td
    cfe/trunk/include/clang/Driver/Options.td
    cfe/trunk/lib/Driver/Tools.cpp
    cfe/trunk/www/cxx_status.html

Modified: cfe/trunk/include/clang/Driver/CC1Options.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/CC1Options.td?rev=230112&r1=230111&r2=230112&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/CC1Options.td (original)
+++ cfe/trunk/include/clang/Driver/CC1Options.td Fri Feb 20 19:03:48 2015
@@ -518,6 +518,10 @@ def fno_deprecated_macro : Flag<["-"], "
   HelpText<"Undefines the __DEPRECATED macro">;
 def fsized_deallocation : Flag<["-"], "fsized-deallocation">,
   HelpText<"Enable C++14 sized global deallocation functions">;
+def fno_sized_deallocation: Flag<["-"], "fno-sized-deallocation">,
+  HelpText<"Disable sized deallocation functions">;
+def fdefine_sized_deallocation: Flag<["-"], "fdefine-sized-deallocation">,
+  HelpText<"Allow compiler-generated definition of sized deallocation functions">;
 def fobjc_subscripting_legacy_runtime : Flag<["-"], "fobjc-subscripting-legacy-runtime">,
   HelpText<"Allow Objective-C array and dictionary subscripting in legacy runtime">;
 def vtordisp_mode_EQ : Joined<["-"], "vtordisp-mode=">,

Modified: cfe/trunk/include/clang/Driver/Options.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=230112&r1=230111&r2=230112&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/Options.td (original)
+++ cfe/trunk/include/clang/Driver/Options.td Fri Feb 20 19:03:48 2015
@@ -394,10 +394,6 @@ def fasm_blocks : Flag<["-"], "fasm-bloc
 def fno_asm_blocks : Flag<["-"], "fno-asm-blocks">, Group<f_Group>;
 
 def fassume_sane_operator_new : Flag<["-"], "fassume-sane-operator-new">, Group<f_Group>;
-def fno_sized_deallocation: Flag<["-"], "fno-sized-deallocation">, Group<f_Group>,
-  HelpText<"Disable sized deallocation functions">, Flags<[CC1Option]>;
-def fdefine_sized_deallocation: Flag<["-"], "fdefine-sized-deallocation">, Group<f_Group>,
-  HelpText<"Allow compiler-generated definition of sized deallocation functions">, Flags<[CC1Option]>;
 def fastcp : Flag<["-"], "fastcp">, Group<f_Group>;
 def fastf : Flag<["-"], "fastf">, Group<f_Group>;
 def fast : Flag<["-"], "fast">, Group<f_Group>;

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=230112&r1=230111&r2=230112&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Fri Feb 20 19:03:48 2015
@@ -4222,15 +4222,6 @@ void Clang::ConstructJob(Compilation &C,
   if (!Args.hasFlag(options::OPT_fassume_sane_operator_new,
                     options::OPT_fno_assume_sane_operator_new))
     CmdArgs.push_back("-fno-assume-sane-operator-new");
-  
-  // -fno-sized-deallocation: disable sized delete.
-  if (Args.hasArg(options::OPT_fno_sized_deallocation))
-    CmdArgs.push_back("-fno-sized-deallocation");
-  
-  // -fdefine-sized-deallocation: default implementation of sized delete as a
-  // weak definition.
-  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.

Modified: cfe/trunk/www/cxx_status.html
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/www/cxx_status.html?rev=230112&r1=230111&r2=230112&view=diff
==============================================================================
--- cfe/trunk/www/cxx_status.html (original)
+++ cfe/trunk/www/cxx_status.html Fri Feb 20 19:03:48 2015
@@ -505,12 +505,13 @@ Clang version in which each feature beca
     </tr>
 </table>
 <p>
-<span id="n3778">(6): As of Clang 3.7, using sized deallocation in C++14 mode requires linking either
-libc++ 3.7 or later, or libstdc++ 5 or later. Alternatively, you can use the 
-<code>-fdefine-sized-deallocation</code> compiler option to enable the implementation under 
-Clang 3.4 through Clang 3.6, where weak definitions of sized deallocation functions are implicitly 
-generated (by the compiler). You can also use the <code>-fno-sized-deallocation</code> option 
-to disable sized deallocation.
+<span id="n3778">(6): In Clang SVN, using sized deallocation in C++14 mode requires linking either
+libc++ 3.7 or later, or libstdc++ 5 or later. Alternatively, you can use the
+<code>-Xclang -fdefine-sized-deallocation</code> compiler option to enable the implementation from
+Clang 3.4 through Clang 3.6, where weak definitions of sized deallocation functions are implicitly
+generated (by the compiler). You can also use the <code>-Xclang -fno-sized-deallocation</code> option 
+to disable sized deallocation. Note that both of these flags arw temporary provisions and may go away
+soon.
 </span>
 </p>