summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/llvm/ConstantHandling.h30
-rw-r--r--lib/VMCore/ConstantFold.h30
-rw-r--r--lib/VMCore/ConstantFolding.h30
3 files changed, 33 insertions, 57 deletions
diff --git a/include/llvm/ConstantHandling.h b/include/llvm/ConstantHandling.h
index 501f726a85..453c3e88b1 100644
--- a/include/llvm/ConstantHandling.h
+++ b/include/llvm/ConstantHandling.h
@@ -12,10 +12,8 @@
//
//===----------------------------------------------------------------------===//
//
-// WARNING: These operators return pointers to newly 'new'd objects. You MUST
-// make sure to free them if you don't want them hanging around. Also,
-// note that these may return a null object if I don't know how to
-// perform those operations on the specified constant types.
+// WARNING: These operators may return a null object if I don't know how to
+// perform the specified operation on the specified constant types.
//
//===----------------------------------------------------------------------===//
//
@@ -42,13 +40,18 @@
namespace opt {
//===----------------------------------------------------------------------===//
-// Implement == directly...
+// Implement == and != directly...
//===----------------------------------------------------------------------===//
inline ConstPoolBool *operator==(const ConstPoolVal &V1,
const ConstPoolVal &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
- return new ConstPoolBool(V1.equals(&V2));
+ return ConstPoolBool::get(&V1 == &V2);
+}
+
+inline ConstPoolBool *operator!=(const ConstPoolVal &V1,
+ const ConstPoolVal &V2) {
+ return ConstPoolBool::get(&V1 != &V2);
}
//===----------------------------------------------------------------------===//
@@ -156,25 +159,14 @@ inline ConstPoolBool *operator>(const ConstPoolVal &V1,
return V2 < V1;
}
-inline ConstPoolBool *operator!=(const ConstPoolVal &V1,
- const ConstPoolVal &V2) {
- ConstPoolBool *Result = V1 == V2;
- Result->setValue(!Result->getValue()); // Invert value
- return Result; // !(V1 == V2)
-}
-
inline ConstPoolBool *operator>=(const ConstPoolVal &V1,
const ConstPoolVal &V2) {
- ConstPoolBool *Result = V1 < V2;
- Result->setValue(!Result->getValue()); // Invert value
- return Result; // !(V1 < V2)
+ return (V1 < V2)->inverted(); // !(V1 < V2)
}
inline ConstPoolBool *operator<=(const ConstPoolVal &V1,
const ConstPoolVal &V2) {
- ConstPoolBool *Result = V1 > V2;
- Result->setValue(!Result->getValue()); // Invert value
- return Result; // !(V1 > V2)
+ return (V1 > V2)->inverted(); // !(V1 > V2)
}
diff --git a/lib/VMCore/ConstantFold.h b/lib/VMCore/ConstantFold.h
index 501f726a85..453c3e88b1 100644
--- a/lib/VMCore/ConstantFold.h
+++ b/lib/VMCore/ConstantFold.h
@@ -12,10 +12,8 @@
//
//===----------------------------------------------------------------------===//
//
-// WARNING: These operators return pointers to newly 'new'd objects. You MUST
-// make sure to free them if you don't want them hanging around. Also,
-// note that these may return a null object if I don't know how to
-// perform those operations on the specified constant types.
+// WARNING: These operators may return a null object if I don't know how to
+// perform the specified operation on the specified constant types.
//
//===----------------------------------------------------------------------===//
//
@@ -42,13 +40,18 @@
namespace opt {
//===----------------------------------------------------------------------===//
-// Implement == directly...
+// Implement == and != directly...
//===----------------------------------------------------------------------===//
inline ConstPoolBool *operator==(const ConstPoolVal &V1,
const ConstPoolVal &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
- return new ConstPoolBool(V1.equals(&V2));
+ return ConstPoolBool::get(&V1 == &V2);
+}
+
+inline ConstPoolBool *operator!=(const ConstPoolVal &V1,
+ const ConstPoolVal &V2) {
+ return ConstPoolBool::get(&V1 != &V2);
}
//===----------------------------------------------------------------------===//
@@ -156,25 +159,14 @@ inline ConstPoolBool *operator>(const ConstPoolVal &V1,
return V2 < V1;
}
-inline ConstPoolBool *operator!=(const ConstPoolVal &V1,
- const ConstPoolVal &V2) {
- ConstPoolBool *Result = V1 == V2;
- Result->setValue(!Result->getValue()); // Invert value
- return Result; // !(V1 == V2)
-}
-
inline ConstPoolBool *operator>=(const ConstPoolVal &V1,
const ConstPoolVal &V2) {
- ConstPoolBool *Result = V1 < V2;
- Result->setValue(!Result->getValue()); // Invert value
- return Result; // !(V1 < V2)
+ return (V1 < V2)->inverted(); // !(V1 < V2)
}
inline ConstPoolBool *operator<=(const ConstPoolVal &V1,
const ConstPoolVal &V2) {
- ConstPoolBool *Result = V1 > V2;
- Result->setValue(!Result->getValue()); // Invert value
- return Result; // !(V1 > V2)
+ return (V1 > V2)->inverted(); // !(V1 > V2)
}
diff --git a/lib/VMCore/ConstantFolding.h b/lib/VMCore/ConstantFolding.h
index 501f726a85..453c3e88b1 100644
--- a/lib/VMCore/ConstantFolding.h
+++ b/lib/VMCore/ConstantFolding.h
@@ -12,10 +12,8 @@
//
//===----------------------------------------------------------------------===//
//
-// WARNING: These operators return pointers to newly 'new'd objects. You MUST
-// make sure to free them if you don't want them hanging around. Also,
-// note that these may return a null object if I don't know how to
-// perform those operations on the specified constant types.
+// WARNING: These operators may return a null object if I don't know how to
+// perform the specified operation on the specified constant types.
//
//===----------------------------------------------------------------------===//
//
@@ -42,13 +40,18 @@
namespace opt {
//===----------------------------------------------------------------------===//
-// Implement == directly...
+// Implement == and != directly...
//===----------------------------------------------------------------------===//
inline ConstPoolBool *operator==(const ConstPoolVal &V1,
const ConstPoolVal &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
- return new ConstPoolBool(V1.equals(&V2));
+ return ConstPoolBool::get(&V1 == &V2);
+}
+
+inline ConstPoolBool *operator!=(const ConstPoolVal &V1,
+ const ConstPoolVal &V2) {
+ return ConstPoolBool::get(&V1 != &V2);
}
//===----------------------------------------------------------------------===//
@@ -156,25 +159,14 @@ inline ConstPoolBool *operator>(const ConstPoolVal &V1,
return V2 < V1;
}
-inline ConstPoolBool *operator!=(const ConstPoolVal &V1,
- const ConstPoolVal &V2) {
- ConstPoolBool *Result = V1 == V2;
- Result->setValue(!Result->getValue()); // Invert value
- return Result; // !(V1 == V2)
-}
-
inline ConstPoolBool *operator>=(const ConstPoolVal &V1,
const ConstPoolVal &V2) {
- ConstPoolBool *Result = V1 < V2;
- Result->setValue(!Result->getValue()); // Invert value
- return Result; // !(V1 < V2)
+ return (V1 < V2)->inverted(); // !(V1 < V2)
}
inline ConstPoolBool *operator<=(const ConstPoolVal &V1,
const ConstPoolVal &V2) {
- ConstPoolBool *Result = V1 > V2;
- Result->setValue(!Result->getValue()); // Invert value
- return Result; // !(V1 > V2)
+ return (V1 > V2)->inverted(); // !(V1 > V2)
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 19:24:49 +0000