Index: llvm/trunk/lib/CodeGen/Analysis.cpp
===================================================================
--- llvm/trunk/lib/CodeGen/Analysis.cpp
+++ llvm/trunk/lib/CodeGen/Analysis.cpp
@@ -156,7 +156,7 @@
 
 /// ExtractTypeInfo - Returns the type info, possibly bitcast, encoded in V.
 GlobalValue *llvm::ExtractTypeInfo(Value *V) {
-  V = V->stripPointerCasts();
+  V = V->stripPointerCastsNoFollowAliases();
   GlobalValue *GV = dyn_cast<GlobalValue>(V);
   GlobalVariable *Var = dyn_cast<GlobalVariable>(V);
 
Index: llvm/trunk/test/CodeGen/X86/typeid-alias.ll
===================================================================
--- llvm/trunk/test/CodeGen/X86/typeid-alias.ll
+++ llvm/trunk/test/CodeGen/X86/typeid-alias.ll
@@ -0,0 +1,18 @@
+; Test that we don't crash in the case where the type info object is an
+; alias pointing to a non-zero offset within a global.
+
+; RUN: llc < %s | FileCheck %s
+
+target triple = "x86_64-unknown-linux-gnu"
+
+%struct.exception = type { i8, i8, i32, i8*, i8*, i32, i8* }
+@g = global %struct.exception zeroinitializer
+@a = alias %struct.exception, %struct.exception* inttoptr (i64 add (i64 ptrtoint (%struct.exception* @g to i64), i64 1297036692682702848) to %struct.exception*)
+
+define i32 @typeid() {
+  ; CHECK: movl $1, %eax
+  %eh_typeid = tail call i32 @llvm.eh.typeid.for( i8* getelementptr (%struct.exception, %struct.exception* @a, i32 0, i32 0))
+  ret i32 %eh_typeid
+}
+
+declare i32 @llvm.eh.typeid.for(i8*)