[llvm] r231254 - Revert r231221, "Devirtualize ~parser<T> by making it protected in base classes and making derived classes final"

[Rafael Espíndola]

Was the error the one in:

http://llvm.org/bugs/show_bug.cgi?id=22789

?

On 4 March 2015 at 08:24, NAKAMURA Takumi <geek4civic at gmail.com> wrote:
> Author: chapuni
> Date: Wed Mar  4 10:24:40 2015
> New Revision: 231254
>
> URL: http://llvm.org/viewvc/llvm-project?rev=231254&view=rev
> Log:
> Revert r231221, "Devirtualize ~parser<T> by making it protected in base classes and making derived classes final"
>
> It broke seflhosting.
>
> Modified:
>     llvm/trunk/include/llvm/Support/CommandLine.h
>
> Modified: llvm/trunk/include/llvm/Support/CommandLine.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/CommandLine.h?rev=231254&r1=231253&r2=231254&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Support/CommandLine.h (original)
> +++ llvm/trunk/include/llvm/Support/CommandLine.h Wed Mar  4 10:24:40 2015
> @@ -714,6 +714,7 @@ class basic_parser_impl { // non-templat
>  public:
>    basic_parser_impl(Option &O) {}
>
> +  virtual ~basic_parser_impl() {}
>
>    enum ValueExpected getValueExpectedFlagDefault() const {
>      return ValueRequired;
> @@ -742,7 +743,6 @@ public:
>    virtual void anchor();
>
>  protected:
> -  ~basic_parser_impl() = default;
>    // A helper for basic_parser::printOptionDiff.
>    void printOptionName(const Option &O, size_t GlobalWidth) const;
>  };
> @@ -755,15 +755,12 @@ public:
>    basic_parser(Option &O) : basic_parser_impl(O) {}
>    typedef DataType parser_data_type;
>    typedef OptionValue<DataType> OptVal;
> -
> -protected:
> -  ~basic_parser() = default;
>  };
>
>  //--------------------------------------------------
>  // parser<bool>
>  //
> -template <> class parser<bool> final : public basic_parser<bool> {
> +template <> class parser<bool> : public basic_parser<bool> {
>  public:
>    parser(Option &O) : basic_parser(O) {}
>
> @@ -790,8 +787,7 @@ EXTERN_TEMPLATE_INSTANTIATION(class basi
>
>  //--------------------------------------------------
>  // parser<boolOrDefault>
> -template <>
> -class parser<boolOrDefault> final : public basic_parser<boolOrDefault> {
> +template <> class parser<boolOrDefault> : public basic_parser<boolOrDefault> {
>  public:
>    parser(Option &O) : basic_parser(O) {}
>
> @@ -817,7 +813,7 @@ EXTERN_TEMPLATE_INSTANTIATION(class basi
>  //--------------------------------------------------
>  // parser<int>
>  //
> -template <> class parser<int> final : public basic_parser<int> {
> +template <> class parser<int> : public basic_parser<int> {
>  public:
>    parser(Option &O) : basic_parser(O) {}
>
> @@ -839,7 +835,7 @@ EXTERN_TEMPLATE_INSTANTIATION(class basi
>  //--------------------------------------------------
>  // parser<unsigned>
>  //
> -template <> class parser<unsigned> final : public basic_parser<unsigned> {
> +template <> class parser<unsigned> : public basic_parser<unsigned> {
>  public:
>    parser(Option &O) : basic_parser(O) {}
>
> @@ -862,8 +858,7 @@ EXTERN_TEMPLATE_INSTANTIATION(class basi
>  // parser<unsigned long long>
>  //
>  template <>
> -class parser<unsigned long long> final
> -    : public basic_parser<unsigned long long> {
> +class parser<unsigned long long> : public basic_parser<unsigned long long> {
>  public:
>    parser(Option &O) : basic_parser(O) {}
>
> @@ -886,7 +881,7 @@ EXTERN_TEMPLATE_INSTANTIATION(class basi
>  //--------------------------------------------------
>  // parser<double>
>  //
> -template <> class parser<double> final : public basic_parser<double> {
> +template <> class parser<double> : public basic_parser<double> {
>  public:
>    parser(Option &O) : basic_parser(O) {}
>
> @@ -908,7 +903,7 @@ EXTERN_TEMPLATE_INSTANTIATION(class basi
>  //--------------------------------------------------
>  // parser<float>
>  //
> -template <> class parser<float> final : public basic_parser<float> {
> +template <> class parser<float> : public basic_parser<float> {
>  public:
>    parser(Option &O) : basic_parser(O) {}
>
> @@ -930,7 +925,7 @@ EXTERN_TEMPLATE_INSTANTIATION(class basi
>  //--------------------------------------------------
>  // parser<std::string>
>  //
> -template <> class parser<std::string> final : public basic_parser<std::string> {
> +template <> class parser<std::string> : public basic_parser<std::string> {
>  public:
>    parser(Option &O) : basic_parser(O) {}
>
> @@ -955,7 +950,7 @@ EXTERN_TEMPLATE_INSTANTIATION(class basi
>  //--------------------------------------------------
>  // parser<char>
>  //
> -template <> class parser<char> final : public basic_parser<char> {
> +template <> class parser<char> : public basic_parser<char> {
>  public:
>    parser(Option &O) : basic_parser(O) {}
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits