From ed141bab630026a6109acc89556dd8ff3eaee504 Mon Sep 17 00:00:00 2001
From: "Ivan A. Kosarev" <ikosarev@accesssoftek.com>
Date: Tue, 17 Oct 2017 09:12:13 +0000
Subject: [CodeGen] EmitPointerWithAlignment() to generate TBAA info along with
 LValue base info

Differential Revision: https://reviews.llvm.org/D38796

llvm-svn: 315984
---
 clang/lib/CodeGen/CodeGenModule.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'clang/lib/CodeGen/CodeGenModule.cpp')

diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 703fa7c9428..4be2a94b166 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -612,6 +612,13 @@ TBAAAccessInfo CodeGenModule::getTBAAMayAliasAccessInfo() {
   return TBAA->getMayAliasAccessInfo();
 }
 
+TBAAAccessInfo CodeGenModule::mergeTBAAInfoForCast(TBAAAccessInfo SourceInfo,
+                                                   TBAAAccessInfo TargetInfo) {
+  if (!TBAA)
+    return TBAAAccessInfo();
+  return TBAA->mergeTBAAInfoForCast(SourceInfo, TargetInfo);
+}
+
 void CodeGenModule::DecorateInstructionWithTBAA(llvm::Instruction *Inst,
                                                 TBAAAccessInfo TBAAInfo) {
   if (llvm::MDNode *Tag = getTBAAAccessTagInfo(TBAAInfo))
-- 
cgit v1.2.3