diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-01-29 12:20:32 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-29 12:20:32 -0600 |
commit | 6adb00247896c7c1102e14c8a87d6a1a2e9031f9 (patch) | |
tree | e74ace939b26d2acbabf01321070bddcaf99c96e /bindgen-integration/cpp/Test.h | |
parent | 821b133702b7fd8e719ae62382aa9579f802867a (diff) | |
parent | 29705c24aa998436bcd013387a2798b519374c78 (diff) |
Auto merge of #1240 - emilio:virtual-dtor-fix, r=fitzgen
ir: Choose the right mangling for destructors on all codepaths.
Fixes #1133.
Diffstat (limited to 'bindgen-integration/cpp/Test.h')
-rw-r--r-- | bindgen-integration/cpp/Test.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/bindgen-integration/cpp/Test.h b/bindgen-integration/cpp/Test.h index 4ab8373e..323a9216 100644 --- a/bindgen-integration/cpp/Test.h +++ b/bindgen-integration/cpp/Test.h @@ -19,6 +19,19 @@ class ITest { virtual void foo() = 0; }; +class VirtualDestructor { +public: + static unsigned sDestructorCount; + virtual ~VirtualDestructor() = 0; +}; + +class InheritsFromVirtualDestructor final : public VirtualDestructor { +public: + static unsigned sDestructorCount; + InheritsFromVirtualDestructor(); + ~InheritsFromVirtualDestructor() final; +}; + namespace testing { typedef Test TypeAlias; |