From a137f870513d59ba4759ef5e6069a075f4934898 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 20 Jul 2001 19:14:41 +0000 Subject: [PATCH] Add multiply as a supported constant propogation operation Include the LevelChange.h header in AllOpts.h git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ConstantHandling.h | 7 +++++++ include/llvm/Optimizations/AllOpts.h | 5 +++++ lib/VMCore/ConstantFold.h | 7 +++++++ lib/VMCore/ConstantFolding.h | 7 +++++++ 4 files changed, 26 insertions(+) diff --git a/include/llvm/ConstantHandling.h b/include/llvm/ConstantHandling.h index 79dd21c2c67..de79ab36003 100644 --- a/include/llvm/ConstantHandling.h +++ b/include/llvm/ConstantHandling.h @@ -67,6 +67,8 @@ public: const ConstPoolVal *V2) const = 0; virtual ConstPoolVal *sub(const ConstPoolVal *V1, const ConstPoolVal *V2) const = 0; + virtual ConstPoolVal *mul(const ConstPoolVal *V1, + const ConstPoolVal *V2) const = 0; virtual ConstPoolBool *lessthan(const ConstPoolVal *V1, const ConstPoolVal *V2) const = 0; @@ -103,6 +105,11 @@ inline ConstPoolVal *operator-(const ConstPoolVal &V1, const ConstPoolVal &V2) { return ConstRules::get(V1)->sub(&V1, &V2); } +inline ConstPoolVal *operator*(const ConstPoolVal &V1, const ConstPoolVal &V2) { + assert(V1.getType() == V2.getType() && "Constant types must be identical!"); + return ConstRules::get(V1)->mul(&V1, &V2); +} + inline ConstPoolBool *operator<(const ConstPoolVal &V1, const ConstPoolVal &V2) { assert(V1.getType() == V2.getType() && "Constant types must be identical!"); diff --git a/include/llvm/Optimizations/AllOpts.h b/include/llvm/Optimizations/AllOpts.h index bbe9af6d31d..4add7137654 100644 --- a/include/llvm/Optimizations/AllOpts.h +++ b/include/llvm/Optimizations/AllOpts.h @@ -39,4 +39,9 @@ #include "llvm/Optimizations/InductionVars.h" +//===----------------------------------------------------------------------===// +// LevelChange - Code lowering and raising +// +#include "llvm/Optimizations/LevelChange.h" + #endif diff --git a/lib/VMCore/ConstantFold.h b/lib/VMCore/ConstantFold.h index 79dd21c2c67..de79ab36003 100644 --- a/lib/VMCore/ConstantFold.h +++ b/lib/VMCore/ConstantFold.h @@ -67,6 +67,8 @@ public: const ConstPoolVal *V2) const = 0; virtual ConstPoolVal *sub(const ConstPoolVal *V1, const ConstPoolVal *V2) const = 0; + virtual ConstPoolVal *mul(const ConstPoolVal *V1, + const ConstPoolVal *V2) const = 0; virtual ConstPoolBool *lessthan(const ConstPoolVal *V1, const ConstPoolVal *V2) const = 0; @@ -103,6 +105,11 @@ inline ConstPoolVal *operator-(const ConstPoolVal &V1, const ConstPoolVal &V2) { return ConstRules::get(V1)->sub(&V1, &V2); } +inline ConstPoolVal *operator*(const ConstPoolVal &V1, const ConstPoolVal &V2) { + assert(V1.getType() == V2.getType() && "Constant types must be identical!"); + return ConstRules::get(V1)->mul(&V1, &V2); +} + inline ConstPoolBool *operator<(const ConstPoolVal &V1, const ConstPoolVal &V2) { assert(V1.getType() == V2.getType() && "Constant types must be identical!"); diff --git a/lib/VMCore/ConstantFolding.h b/lib/VMCore/ConstantFolding.h index 79dd21c2c67..de79ab36003 100644 --- a/lib/VMCore/ConstantFolding.h +++ b/lib/VMCore/ConstantFolding.h @@ -67,6 +67,8 @@ public: const ConstPoolVal *V2) const = 0; virtual ConstPoolVal *sub(const ConstPoolVal *V1, const ConstPoolVal *V2) const = 0; + virtual ConstPoolVal *mul(const ConstPoolVal *V1, + const ConstPoolVal *V2) const = 0; virtual ConstPoolBool *lessthan(const ConstPoolVal *V1, const ConstPoolVal *V2) const = 0; @@ -103,6 +105,11 @@ inline ConstPoolVal *operator-(const ConstPoolVal &V1, const ConstPoolVal &V2) { return ConstRules::get(V1)->sub(&V1, &V2); } +inline ConstPoolVal *operator*(const ConstPoolVal &V1, const ConstPoolVal &V2) { + assert(V1.getType() == V2.getType() && "Constant types must be identical!"); + return ConstRules::get(V1)->mul(&V1, &V2); +} + inline ConstPoolBool *operator<(const ConstPoolVal &V1, const ConstPoolVal &V2) { assert(V1.getType() == V2.getType() && "Constant types must be identical!");