Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions cpp2rust/converter/converter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2621,6 +2621,18 @@ bool Converter::VisitInitListExpr(clang::InitListExpr *expr) {
return false;
}

bool Converter::VisitCompoundLiteralExpr(clang::CompoundLiteralExpr *expr) {
auto record = expr->getType()->getAsRecordDecl();
if (!record || !record->hasAttr<clang::TransparentUnionAttr>()) {
return true;
}
auto init = clang::cast<clang::InitListExpr>(expr->getInitializer());
assert(init->getNumInits() == 1);
PushExprKind push(*this, ExprKind::RValue);
Convert(init->getInit(0));
return false;
}

bool Converter::VisitArraySubscriptExpr(clang::ArraySubscriptExpr *expr) {
auto *base = expr->getBase();
if (base->IgnoreCasts()->getType()->isPointerType()) {
Expand Down
2 changes: 2 additions & 0 deletions cpp2rust/converter/converter.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {

virtual bool VisitInitListExpr(clang::InitListExpr *expr);

virtual bool VisitCompoundLiteralExpr(clang::CompoundLiteralExpr *expr);

virtual bool VisitArraySubscriptExpr(clang::ArraySubscriptExpr *expr);

virtual bool VisitCXXNullPtrLiteralExpr(clang::CXXNullPtrLiteralExpr *expr);
Expand Down
1 change: 1 addition & 0 deletions rules/socket/src.cpp → rules/socket/src.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#define _GNU_SOURCE
#include <sys/types.h>
#include <sys/socket.h>

Expand Down
37 changes: 37 additions & 0 deletions tests/unit/out/unsafe/socket_transparent_union.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
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 {
std::process::exit(main_0() as i32);
}
}
unsafe fn main_0() -> i32 {
let mut fd: i32 = 0;
let mut ssloc: sockaddr_storage = std::mem::zeroed::<sockaddr_storage>();
let mut slen: u32 = (::std::mem::size_of::<sockaddr_storage>() as u64 as u32);
assert!(
((((libc::getsockname(
fd,
((&mut ssloc as *mut sockaddr_storage) as *mut sockaddr),
(&mut slen as *mut u32)
)) == (-1_i32)) as i32)
!= 0)
);
let mut sin: sockaddr_in = std::mem::zeroed::<sockaddr_in>();
let mut inlen: u32 = (::std::mem::size_of::<sockaddr_in>() as u64 as u32);
assert!(
((((libc::getsockname(
fd,
((&mut sin as *mut sockaddr_in) as *mut sockaddr),
(&mut inlen as *mut u32)
)) == (-1_i32)) as i32)
!= 0)
);
return 0;
}
20 changes: 20 additions & 0 deletions tests/unit/socket_transparent_union.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// no-compile: refcount
#define _GNU_SOURCE
#include <assert.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <sys/types.h>

int main(void) {
int fd = 0;

struct sockaddr_storage ssloc;
socklen_t slen = sizeof(ssloc);
assert(getsockname(fd, (struct sockaddr *)&ssloc, &slen) == -1);

struct sockaddr_in sin;
socklen_t inlen = sizeof(sin);
assert(getsockname(fd, (struct sockaddr *)&sin, &inlen) == -1);

return 0;
}
Loading