This is an archive of the discontinued LLVM Phabricator instance.

Differential D36386

[clang] Remove unit test which uses reverse-iterate flag
ClosedPublic

Authored by mgrang on Aug 6 2017, 10:39 PM.

Details

Reviewers
dblaikie
mehdi_amini
Commits
rG01cbd18ee914: [clang] Remove unit test which uses reverse-iterate flag
rC311720: [clang] Remove unit test which uses reverse-iterate flag
rL311720: [clang] Remove unit test which uses reverse-iterate flag
Summary

This patch is in response to https://reviews.llvm.org/D35043 which removed -reverse-iterate flag.

Diff Detail

Event Timeline

mgrang created this revision.Aug 6 2017, 10:39 PM
mgrang added a comment.Aug 7 2017, 12:08 PM

This patch does 3 things:

  1. Get rid of the unit test objc-modern-metadata-visibility2.mm because this test check uses flag -reverse-iterate. This flag will be removed in D35043.
  1. D35043 gets rid of the empty base definition for PointerLikeTypeTraits. This results in a compiler warning because PointerLikeTypeTrait has been defined as struct here while in the header it is a class. So I have changed struct to class.
  1. Since I changed struct PointerLikeTypeTrait to class PointerLikeTypeTrait here, the member functions are no longer public now. This results in a compiler error. So I explicitly marked them as public here.
mgrang updated this revision to Diff 111557.Aug 17 2017, 1:23 PM
mgrang retitled this revision from [clang] Remove unit test which uses reverse-iterate and fix a PointerLikeTypeTrait specialization to [clang] Remove unit test which uses reverse-iterate flag.
mgrang edited the summary of this revision. (Show Details)
dblaikie accepted this revision.Aug 24 2017, 1:41 PM

sounds good - so long as other tests would fail if the fix this test was testing wasn't present (on a reverse iteration enabled build)

This revision is now accepted and ready to land.Aug 24 2017, 1:41 PM
Closed by commit rL311720: [clang] Remove unit test which uses reverse-iterate flag (authored by mgrang). · Explain WhyAug 24 2017, 3:41 PM
This revision was automatically updated to reflect the committed changes.
mgrang added a comment.Aug 24 2017, 3:44 PM
In D36386#851853, @dblaikie wrote:

sounds good - so long as other tests would fail if the fix this test was testing wasn't present (on a reverse iteration enabled build)

Thanks! Yes, I verified that the test objc-modern-metadata-visibility.mm would fail in a reverse iteration build w/o the fix this was testing.

Revision Contents

PathSize
include/
clang/
AST/
3 lines
test/
Rewriter/

Diff 109951

include/clang/AST/ExternalASTSource.h

Show First 20 Lines • Show All 460 Lines • ▼ Show 20 Lines
}; };
} // end namespace clang } // end namespace clang
/// Specialize PointerLikeTypeTraits to allow LazyGenerationalUpdatePtr to be /// Specialize PointerLikeTypeTraits to allow LazyGenerationalUpdatePtr to be
/// placed into a PointerUnion. /// placed into a PointerUnion.
namespace llvm { namespace llvm {
template<typename Owner, typename T, template<typename Owner, typename T,
void (clang::ExternalASTSource::*Update)(Owner)> void (clang::ExternalASTSource::*Update)(Owner)>
struct PointerLikeTypeTraits< class PointerLikeTypeTraits<
clang::LazyGenerationalUpdatePtr<Owner, T, Update>> { clang::LazyGenerationalUpdatePtr<Owner, T, Update>> {
typedef clang::LazyGenerationalUpdatePtr<Owner, T, Update> Ptr; typedef clang::LazyGenerationalUpdatePtr<Owner, T, Update> Ptr;
public:
static void *getAsVoidPointer(Ptr P) { return P.getOpaqueValue(); } static void *getAsVoidPointer(Ptr P) { return P.getOpaqueValue(); }
static Ptr getFromVoidPointer(void *P) { return Ptr::getFromOpaqueValue(P); } static Ptr getFromVoidPointer(void *P) { return Ptr::getFromOpaqueValue(P); }
enum { enum {
NumLowBitsAvailable = PointerLikeTypeTraits<T>::NumLowBitsAvailable - 1 NumLowBitsAvailable = PointerLikeTypeTraits<T>::NumLowBitsAvailable - 1
}; };
}; };
} }
▲ Show 20 Lines • Show All 105 Lines • Show Last 20 Lines

test/Rewriter/objc-modern-metadata-visibility2.mm

  • This file was deleted.
// REQUIRES: abi-breaking-checks
// NOTE: This test has been split from objc-modern-metadata-visibility.mm in
// order to test with -reverse-iterate as this flag is only present with
// ABI_BREAKING_CHECKS.
// RUN: %clang_cc1 -E %s -o %t.mm -mllvm -reverse-iterate
// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -mllvm -reverse-iterate -o - | FileCheck %s
// rdar://11144048
@class NSString;
@interface NSObject {
Class isa;
}
@end
@interface Sub : NSObject {
int subIvar;
NSString *nsstring;
@private
id PrivateIvar;
}
@end
@implementation Sub
- (id) MyNSString { return subIvar ? PrivateIvar : nsstring; }
@end
@interface NSString @end
@implementation NSString @end
// CHECK: __declspec(allocate(".objc_ivar$B")) extern "C" __declspec(dllimport) unsigned long OBJC_IVAR_$_Sub$subIvar;
// CHECK: __declspec(allocate(".objc_ivar$B")) extern "C" unsigned long OBJC_IVAR_$_Sub$PrivateIvar;
// CHECK: __declspec(allocate(".objc_ivar$B")) extern "C" __declspec(dllimport) unsigned long OBJC_IVAR_$_Sub$nsstring;
// CHECK: #pragma warning(disable:4273)
// CHECK: __declspec(allocate(".objc_ivar$B")) extern "C" __declspec(dllexport) unsigned long int OBJC_IVAR_$_Sub$subIvar
// CHECK: __declspec(allocate(".objc_ivar$B")) extern "C" __declspec(dllexport) unsigned long int OBJC_IVAR_$_Sub$nsstring
// CHECK: __declspec(allocate(".objc_ivar$B")) extern "C" unsigned long int OBJC_IVAR_$_Sub$PrivateIvar
// CHECK: extern "C" __declspec(dllimport) struct _class_t OBJC_METACLASS_$_NSObject;
// CHECK: extern "C" __declspec(dllexport) struct _class_t OBJC_METACLASS_$_Sub
// CHECK: extern "C" __declspec(dllimport) struct _class_t OBJC_CLASS_$_NSObject;
// CHECK: extern "C" __declspec(dllexport) struct _class_t OBJC_CLASS_$_Sub
// CHECK: extern "C" __declspec(dllexport) struct _class_t OBJC_CLASS_$_NSString;
// CHECK: extern "C" __declspec(dllexport) struct _class_t OBJC_METACLASS_$_NSString
// CHECK: extern "C" __declspec(dllexport) struct _class_t OBJC_CLASS_$_NSString
include/clang/AST/ExternalASTSource.h