Key unqualified dependent calls in rules (#558)

Author: lucic71

cpp2rust/rule_preprocessing/cpp_rule_indexer.cpp

@@ -179,8 +179,7 @@ std::string DependentExprKey(const clang::Expr *expr) {
       }
     }
     if (auto lookup = llvm::dyn_cast<clang::UnresolvedLookupExpr>(callee);
-        lookup && lookup->getQualifier() &&
-        !llvm::isa<clang::CXXOperatorCallExpr>(call) &&
+        lookup && !llvm::isa<clang::CXXOperatorCallExpr>(call) &&
         lookup->decls_begin() != lookup->decls_end()) {
       return RulesLoader::DeclKey(
           (*lookup->decls_begin())->getUnderlyingDecl());

rules/cctype/src.cpp

@@ -0,0 +1,6 @@
+// Copyright (c) 2022-present INESC-ID.
+// Distributed under the MIT license that can be found in the LICENSE file.
+
+#include <ctype.h>
+
+template <typename T1> int f1(T1 a0) { return toupper(a0); }

rules/cctype/tgt_unsafe.rs

@@ -0,0 +1,11 @@
+// Copyright (c) 2022-present INESC-ID.
+// Distributed under the MIT license that can be found in the LICENSE file.
+
+unsafe fn f1<T1: Into<i32>>(a0: T1) -> i32 {
+    let __c: i32 = a0.into();
+    if (0..=255).contains(&__c) {
+        (__c as u8).to_ascii_uppercase() as i32
+    } else {
+        __c
+    }
+}

tests/unit/out/refcount/template_rule_unqualified_call.rs

@@ -0,0 +1,46 @@
+extern crate libcc2rs;
+use libcc2rs::*;
+use std::cell::RefCell;
+use std::collections::BTreeMap;
+use std::io::prelude::*;
+use std::io::{Read, Seek, Write};
+use std::os::fd::AsFd;
+use std::rc::{Rc, Weak};
+pub fn main() {
+    __cpp2rust_init_globals();
+    std::process::exit(main_0());
+}
+fn main_0() -> i32 {
+    assert!(
+        ({
+            let __c: i32 = (('a' as i8) as i32).into();
+            if (0..=255).contains(&__c) {
+                (__c as u8).to_ascii_uppercase() as i32
+            } else {
+                __c
+            }
+        } == (('A' as i8) as i32))
+    );
+    assert!(
+        ({
+            let __c: i32 = (('Z' as i8) as i32).into();
+            if (0..=255).contains(&__c) {
+                (__c as u8).to_ascii_uppercase() as i32
+            } else {
+                __c
+            }
+        } == (('Z' as i8) as i32))
+    );
+    assert!(
+        ({
+            let __c: i32 = (('5' as i8) as i32).into();
+            if (0..=255).contains(&__c) {
+                (__c as u8).to_ascii_uppercase() as i32
+            } else {
+                __c
+            }
+        } == (('5' as i8) as i32))
+    );
+    return 0;
+}
+pub fn __cpp2rust_init_globals() {}

tests/unit/out/unsafe/template_rule_unqualified_call.rs

@@ -0,0 +1,48 @@
+extern crate libc;
+use libc::*;
+extern crate libcc2rs;
+use libcc2rs::*;
+use std::collections::BTreeMap;
+use std::io::{Read, Seek, Write};
+use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
+use std::rc::Rc;
+pub fn main() {
+    unsafe {
+        __cpp2rust_init_globals();
+        std::process::exit(main_0() as i32);
+    }
+}
+unsafe fn main_0() -> i32 {
+    assert!(
+        (({
+            let __c: i32 = (('a' as libc::c_char) as i32).into();
+            if (0..=255).contains(&__c) {
+                (__c as u8).to_ascii_uppercase() as i32
+            } else {
+                __c
+            }
+        }) == (('A' as libc::c_char) as i32))
+    );
+    assert!(
+        (({
+            let __c: i32 = (('Z' as libc::c_char) as i32).into();
+            if (0..=255).contains(&__c) {
+                (__c as u8).to_ascii_uppercase() as i32
+            } else {
+                __c
+            }
+        }) == (('Z' as libc::c_char) as i32))
+    );
+    assert!(
+        (({
+            let __c: i32 = (('5' as libc::c_char) as i32).into();
+            if (0..=255).contains(&__c) {
+                (__c as u8).to_ascii_uppercase() as i32
+            } else {
+                __c
+            }
+        }) == (('5' as libc::c_char) as i32))
+    );
+    return 0;
+}
+pub unsafe fn __cpp2rust_init_globals() {}

tests/unit/template_rule_unqualified_call.cpp

@@ -0,0 +1,9 @@
+#include <cassert>
+#include <cctype>
+
+int main() {
+  assert(toupper('a') == 'A');
+  assert(toupper('Z') == 'Z');
+  assert(toupper('5') == '5');
+  return 0;
+}