<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
John McCall wrote:<br>
<blockquote cite="mid:4ABBC2C9.1070400@apple.com" type="cite">
<blockquote type="cite">
<pre wrap="">@@ -1778,16 +1779,21 @@ QualType Sema::FindCompositePointerType(
I = QualifierUnion.begin(),
E = QualifierUnion.end();
I != E; (void)++I, ++MOC) {
+ Qualifiers Quals = Qualifiers::fromCVRMask(*I);
if (MOC->first && MOC->second) {
// Rebuild member pointer type
- Composite1 =
Context.getMemberPointerType(Composite1.getQualifiedType(*I),
- MOC->first);
- Composite2 =
Context.getMemberPointerType(Composite2.getQualifiedType(*I),
- MOC->second);
+ Composite1 = Context.getMemberPointerType(
+
Context.getQualifiedType(Composite1, Quals),
+ MOC->first);
+ Composite2 = Context.getMemberPointerType(
+
Context.getQualifiedType(Composite2, Quals),
+ MOC->second);
} else {
// Rebuild pointer type
- Composite1 =
Context.getPointerType(Composite1.getQualifiedType(*I));
- Composite2 =
Context.getPointerType(Composite2.getQualifiedType(*I));
+ Composite1
+ = Context.getPointerType(Context.getQualifiedType(Composite1,
Quals));
+ Composite2
+ = Context.getPointerType(Context.getQualifiedType(Composite2,
Quals));
}
}
Same concern here; we're probably losing non-CVR qualifiers.
</pre>
</blockquote>
<pre wrap=""><!---->
Also fixed.
</pre>
</blockquote>
<br>
I should say, fixed in the "I added a FIXME" sense.<br>
<br>
John.<br>
</body>
</html>