diff --git a/lib/Analysis/BasicAliasAnalysis.cpp b/lib/Analysis/BasicAliasAnalysis.cpp
index 23b89dd..20ecfd2 100644
--- a/lib/Analysis/BasicAliasAnalysis.cpp
+++ b/lib/Analysis/BasicAliasAnalysis.cpp
@@ -120,11 +120,11 @@
     return AliasAnalysis::UnknownSize;
 
   uint64_t Size = TD.getTypeAllocSize(AccessTy);
-  if (RoundToAlign) {
-    if (!Align)
-      return AliasAnalysis::UnknownSize;
+  // If there is an explicitly specified alignment, and we need to
+  // take alignment into account, round up the size. (If the alignment
+  // is implicit, getTypeAllocSize is sufficient.)
+  if (RoundToAlign && Align)
     Size = RoundUpToAlignment(Size, Align);
-  }
 
   return Size;
 }
diff --git a/test/Analysis/BasicAA/global-size.ll b/test/Analysis/BasicAA/global-size.ll
index 617f4c3..a7e5aab 100644
--- a/test/Analysis/BasicAA/global-size.ll
+++ b/test/Analysis/BasicAA/global-size.ll
@@ -4,7 +4,7 @@
 ; RUN: opt < %s -basicaa -gvn -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
-@B = global i16 8, align 2
+@B = global i16 8
 
 ; CHECK: @test1
 define i16 @test1(i32* %P) {