Simplications

Signed-off-by: Steffen Larsen <[email protected]>

Author: Steffen Larsen

libclc/utils/libclc-remangler/CMakeLists.txt

@@ -11,4 +11,4 @@ target_include_directories(libclc-remangler PRIVATE
   ${CMAKE_SOURCE_DIR}/../clang/include
   ${CMAKE_BINARY_DIR}/tools/clang/include)
 
-clang_target_link_libraries(libclc-remangler PRIVATE clangBasic)
+clang_target_link_libraries(libclc-remangler PRIVATE clangBasic)

libclc/utils/libclc-remangler/LibclcRemangler.cpp

@@ -492,12 +492,7 @@ class TargetTypeReplacements {
 bool createAlias(Module *M, std::string originalMangledName,
                  const itanium_demangle::Node *functionTree,
                  TargetTypeReplacements replacements) {
-  // If there are no alias replacements, this is trivially done.
-  if (replacements.getAliasTypeReplacements().empty())
-    return true;
-
-  Remangler ATR =
-      Remangler(functionTree, replacements.getAliasTypeReplacements());
+  Remangler ATR{functionTree, replacements.getAliasTypeReplacements()};
   std::string RemangledAliasName = ATR.remangle();
 
   if (ATR.hasFailed())
@@ -530,13 +525,8 @@ bool remangleFunction(Function &func, Module *M,
     return false;
   }
 
-  // No type replacements
-  if (replacements.getParameterTypeReplacements().empty())
-    return true;
-
   // Try to change the parameter types in the function name using the mappings.
-  Remangler R =
-      Remangler(FunctionTree, replacements.getParameterTypeReplacements());
+  Remangler R{FunctionTree, replacements.getParameterTypeReplacements()};
   std::string RemangledName = R.remangle();
 
   if (R.hasFailed())
@@ -606,4 +596,4 @@ int main(int argc, const char **argv) {
   // Declare success.
   Out->keep();
   return 0;
-}
+}