Simplify the 'operator<' for the attribute object.

llvm-svn: 175252
This commit is contained in:
Bill Wendling 2013-02-15 05:25:26 +00:00
parent 5e320e9019
commit 12753ce9bc
2 changed files with 15 additions and 17 deletions

View File

@ -332,25 +332,23 @@ StringRef AttributeImpl::getValueAsString() const {
bool AttributeImpl::operator<(const AttributeImpl &AI) const {
// This sorts the attributes with Attribute::AttrKinds coming first (sorted
// relative to their enum value) and then strings.
if (isEnumAttribute())
if (AI.isAlignAttribute() || AI.isEnumAttribute())
return getKindAsEnum() < AI.getKindAsEnum();
if (isEnumAttribute()) {
if (AI.isEnumAttribute()) return getKindAsEnum() < AI.getKindAsEnum();
if (AI.isAlignAttribute()) return true;
if (AI.isStringAttribute()) return true;
}
if (isAlignAttribute()) {
if (!AI.isStringAttribute() && getKindAsEnum() < AI.getKindAsEnum())
return true;
if (AI.isAlignAttribute())
return getValueAsInt() < AI.getValueAsInt();
if (AI.isEnumAttribute()) return false;
if (AI.isAlignAttribute()) return getValueAsInt() < AI.getValueAsInt();
if (AI.isStringAttribute()) return true;
}
if (isStringAttribute()) {
if (!AI.isStringAttribute()) return false;
if (getKindAsString() < AI.getKindAsString()) return true;
if (getKindAsString() == AI.getKindAsString())
return getValueAsString() < AI.getValueAsString();
}
return false;
if (AI.isEnumAttribute()) return false;
if (AI.isAlignAttribute()) return false;
if (getKindAsString() == AI.getKindAsString())
return getValueAsString() < AI.getValueAsString();
return getKindAsString() < AI.getKindAsString();
}
uint64_t AttributeImpl::getAttrMask(Attribute::AttrKind Val) {

View File

@ -98,7 +98,7 @@ entry:
ret i32 0
; CHECK: @test5(
; CHECK: store i8 4
; CHECK: call void @test5a(%struct.S* align 16 byval %y)
; CHECK: call void @test5a(%struct.S* byval align 16 %y)
}
;; Noop memcpy should be zapped.
@ -123,7 +123,7 @@ entry:
%call = call i32 @g(%struct.p* align 8 byval %agg.tmp) nounwind
ret i32 %call
; CHECK: @test7
; CHECK: call i32 @g(%struct.p* align 8 byval %q) nounwind
; CHECK: call i32 @g(%struct.p* byval align 8 %q) nounwind
}
declare i32 @g(%struct.p* align 8 byval)