2 files changed, 36 insertions, 27 deletions

diff --git a/include/clang/AST/DeclGroup.h b/include/clang/AST/DeclGroup.h
index 2b93f3c2cb..9b5aa1c58d 100644
--- a/include/clang/AST/DeclGroup.h
+++ b/include/clang/AST/DeclGroup.h
@@ -58,7 +58,7 @@ public:
     
 class DeclGroupRef {
 protected:
-  enum Kind { DeclKind=0x0, DeclGroupKind=0x1, Mask=0x1 };  
+  enum Kind { SingleDeclKind=0x0, DeclGroupKind=0x1, Mask=0x1 };  
   Decl* D;
 
   Kind getKind() const {
@@ -75,31 +75,49 @@ public:
   typedef Decl** iterator;
   typedef Decl* const * const_iterator;
   
-  bool hasSolitaryDecl() const {
-    return getKind() == DeclKind;
+  bool isSingleDecl() const { return getKind() == SingleDeclKind; }
+  bool isDeclGroup() const { return getKind() == DeclGroupKind; }
+
+  Decl *getSingleDecl() {
+    assert(isSingleDecl() && "Isn't a declgroup");
+    return D;
+  }
+  const Decl *getSingleDecl() const {
+    return const_cast<DeclGroupRef*>(this)->getSingleDecl();
+  }
+  
+  DeclGroup &getDeclGroup() {
+    assert(isDeclGroup() && "Isn't a declgroup");
+    return *((DeclGroup*)(reinterpret_cast<uintptr_t>(D) & ~Mask));
+  }
+  const DeclGroup &getDeclGroup() const {
+    return const_cast<DeclGroupRef*>(this)->getDeclGroup();
   }
+  
 
   iterator begin() {
-    if (getKind() == DeclKind) return D ? &D : 0;
-    DeclGroup& G = *((DeclGroup*) (reinterpret_cast<uintptr_t>(D) & ~Mask));
-    return &G[0];
+    if (isSingleDecl())
+      return D ? &D : 0;
+    return &getDeclGroup()[0];
   }
 
   iterator end() {
-    if (getKind() == DeclKind) return D ? &D + 1 : 0;
-    DeclGroup& G = *((DeclGroup*) (reinterpret_cast<uintptr_t>(D) & ~Mask));
+    if (isSingleDecl())
+      return D ? &D+1 : 0;
+    DeclGroup &G = getDeclGroup();
     return &G[0] + G.size();
   }
   
   const_iterator begin() const {
-    if (getKind() == DeclKind) return D ? &D : 0;
-    DeclGroup& G = *((DeclGroup*) (reinterpret_cast<uintptr_t>(D) & ~Mask));
-    return &G[0];
+    if (isSingleDecl())
+      return D ? &D : 0;
+    return &getDeclGroup()[0];
   }
   
   const_iterator end() const {
-    if (getKind() == DeclKind) return D ? &D + 1 : 0;
-    DeclGroup& G = *((DeclGroup*) (reinterpret_cast<uintptr_t>(D) & ~Mask));
+    if (isSingleDecl())
+      return D ? &D+1 : 0;
+    const DeclGroup &G = getDeclGroup();
     return &G[0] + G.size();
   }
 
diff --git a/include/clang/AST/Stmt.h b/include/clang/AST/Stmt.h
index e5fa309992..5d1c6dc207 100644
--- a/include/clang/AST/Stmt.h
+++ b/include/clang/AST/Stmt.h
@@ -235,23 +235,14 @@ public:
   
   virtual void Destroy(ASTContext& Ctx);
 
-  // hasSolitaryDecl - This method returns true if this DeclStmt refers
-  // to a single Decl.
+  /// hasSolitaryDecl - This method returns true if this DeclStmt refers
+  /// to a single Decl.
   bool hasSolitaryDecl() const {
-    return DG.hasSolitaryDecl();
+    return DG.isSingleDecl();
   }
  
-  const Decl* getSolitaryDecl() const {
-    assert (hasSolitaryDecl() &&
-            "Caller assumes this DeclStmt points to one Decl*");
-    return *DG.begin();
-  }
-  
-  Decl* getSolitaryDecl() {
-    assert (hasSolitaryDecl() &&
-            "Caller assumes this DeclStmt points to one Decl*");
-    return *DG.begin();
-  }  
+  const Decl* getSolitaryDecl() const { return DG.getSingleDecl(); }
+  Decl *getSolitaryDecl() { return DG.getSingleDecl(); }  
 
   SourceLocation getStartLoc() const { return StartLoc; }
   SourceLocation getEndLoc() const { return EndLoc; }