mozilla-central: changeset 233532:f2a5cd37a1ecdd7c14d54da724ab4499bd0bf927

author	Ms2ger <ms2ger@gmail.com>
	Fri, 13 Mar 2015 13:01:28 +0100
changeset 233532	f2a5cd37a1ecdd7c14d54da724ab4499bd0bf927
parent 233531	4100738d662d18654f30b8f1333d6f366b1781ec
child 233533	877c7d84e0c3e1ca1996685c0a8c129e5fc2f9a9
push id	28417
push user	ryanvm@gmail.com
push date	Fri, 13 Mar 2015 19:52:44 +0000
treeherder	mozilla-central@977add19414a [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bz
milestone	39.0a1
first release with	nightly linux32 38154607d807 / 39.0a1 / 20150314030239 / files nightly linux64 38154607d807 / 39.0a1 / 20150314030239 / files nightly mac 38154607d807 / 39.0a1 / 20150314030239 / files nightly win32 38154607d807 / 39.0a1 / 20150314030239 / files nightly win64 38154607d807 / 39.0a1 / 20150314030239 / files
last release without	nightly linux32 42afc7ef5ccb / 39.0a1 / 20150313030231 / files nightly linux64 42afc7ef5ccb / 39.0a1 / 20150313030231 / files nightly mac 42afc7ef5ccb / 39.0a1 / 20150313030231 / files nightly win32 42afc7ef5ccb / 39.0a1 / 20150313030231 / files nightly win64 42afc7ef5ccb / 39.0a1 / 20150313030231 / files

--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -3201,18 +3201,19 @@ def CopyUnforgeablePropertiesToInstance(
 
 def AssertInheritanceChain(descriptor):
     asserts = ""
     iface = descriptor.interface
     while iface:
         desc = descriptor.getDescriptor(iface.identifier.name)
         asserts += (
             "MOZ_ASSERT(static_cast<%s*>(aObject) == \n"
-            "           reinterpret_cast<%s*>(aObject));\n" %
-            (desc.nativeType, desc.nativeType))
+            "           reinterpret_cast<%s*>(aObject),\n"
+            "           \"Multiple inheritance for %s is broken.\");\n" %
+            (desc.nativeType, desc.nativeType, desc.nativeType))
         iface = iface.parent
     asserts += "MOZ_ASSERT(ToSupportsIsCorrect(aObject));\n"
     return asserts
 
 
 def InitMemberSlots(descriptor, wrapperCache):
     """
     Initialize member slots on our JS object if we're supposed to have some.